Merge branch 'testing'

6 files changed, 38 insertions, 119 deletions

diff --git a/js/util.js b/js/util.js
index 2cff4afc2..88016bd6d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -481,8 +481,9 @@ var SN = { // StatusNet
             var NDGe = $('#'+SN.C.S.NoticeDataGeo);
 
             function removeNoticeDataGeo() {
-                $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
-                $('#'+SN.C.S.NoticeDataGeoSelected).hide();
+                $('label[for='+SN.C.S.NoticeDataGeo+']')
+                    .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
+                    .removeClass('checked');
 
                 $('#'+SN.C.S.NoticeLat).val('');
                 $('#'+SN.C.S.NoticeLon).val('');
@@ -514,17 +515,8 @@ var SN = { // StatusNet
                         NLN_text = location.name;
                     }
 
-                    $('#'+SN.C.S.NoticeGeoName)
-                        .replaceWith('<a id="notice_data-geo_name"/>');
-
-                    $('#'+SN.C.S.NoticeGeoName)
-                        .attr('href', location.url)
-                        .text(NLN_text)
-                        .click(function() {
-                            window.open(location.url);
-
-                            return false;
-                        });
+                    $('label[for='+SN.C.S.NoticeDataGeo+']')
+                        .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
 
                     $('#'+SN.C.S.NoticeLat).val(data.lat);
                     $('#'+SN.C.S.NoticeLon).val(data.lon);
@@ -539,8 +531,7 @@ var SN = { // StatusNet
                         'NLID': lid,
                         'NLN': NLN_text,
                         'NLNU': location.url,
-                        'NDG': true,
-                        'NDGSM': false
+                        'NDG': true
                     };
                     $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue));
                 });
@@ -558,62 +549,14 @@ var SN = { // StatusNet
                 var geocodeURL = NGW.attr('title');
                 NGW.removeAttr('title');
 
-                $('label[for='+SN.C.S.NoticeDataGeo+']').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
+                $('label[for='+SN.C.S.NoticeDataGeo+']')
+                    .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
 
                 NDGe.change(function() {
-                    var NLN = $('#'+SN.C.S.NoticeGeoName);
-                    if (NLN.length > 0) {
-                        NLN.remove();
-                    }
-
                     if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
-                        $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked').attr('title', NoticeDataGeo_text.ShareDisable);
-
-                        var S = '<div id="'+SN.C.S.NoticeDataGeoSelected+'" class="'+SN.C.S.Success+'"/>';
-                        var NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
-
-                        if (NDGS.length > 0) {
-                            NDGS.replaceWith(S);
-                        }
-                        else {
-                            $('#'+SN.C.S.FormNotice).append(S);
-                        }
-
-                        NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
-                        NDGS.prepend('<span id="'+SN.C.S.NoticeGeoName+'">Geo</span> <button class="minimize" title="'+NoticeDataGeo_text.InfoMinimize+'">&#95;</button> <button class="close" title="'+NoticeDataGeo_text.ShareDisable+'">&#215;</button>');
-
-                        var NLN = $('#'+SN.C.S.NoticeGeoName);
-                        NLN.addClass('processing');
-
-                        $('#'+SN.C.S.NoticeDataGeoSelected+' button.close').click(function(){
-                            removeNoticeDataGeo();
-
-                            $('#'+SN.C.S.NoticeDataGeoSelected).remove();
-
-                            $('#'+SN.C.S.NoticeDataText).focus();
-
-                            return false;
-                        });
-
-                        $('#'+SN.C.S.NoticeDataGeoSelected+' button.minimize').click(function(){
-                            $('#'+SN.C.S.NoticeDataGeoSelected).hide();
-
-                            var cookieValue = {
-                                'NLat': $('#'+SN.C.S.NoticeLat).val(),
-                                'NLon': $('#'+SN.C.S.NoticeLat).val(),
-                                'NLNS': $('#'+SN.C.S.NoticeLocationNs).val(),
-                                'NLID': $('#'+SN.C.S.NoticeLocationId).val(),
-                                'NLN': $('#'+SN.C.S.NoticeGeoName).text(),
-                                'NLNU': $('#'+SN.C.S.NoticeGeoName).attr('href'),
-                                'NDG': true,
-                                'NDGSM': true
-                            };
-                            $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue));
-
-                            $('#'+SN.C.S.NoticeDataText).focus();
-
-                            return false;
-                        });
+                        $('label[for='+SN.C.S.NoticeDataGeo+']')
+                            .attr('title', NoticeDataGeo_text.ShareDisable)
+                            .addClass('checked');
 
                         if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
                             if (navigator.geolocation) {
@@ -637,7 +580,6 @@ var SN = { // StatusNet
                                                 removeNoticeDataGeo();
                                                 break;
                                             case error.TIMEOUT:
-                                                $('#'+SN.C.S.NoticeGeoName).text(NoticeDataGeo_text.ErrorTimeout).removeClass('processing');
                                                 $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
                                                 break;
                                         }
@@ -668,27 +610,15 @@ var SN = { // StatusNet
                         else {
                             var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
 
-                            if (cookieValue.NDGSM === true) {
-                                $('#'+SN.C.S.NoticeDataGeoSelected).hide();
-                            }
-
                             $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat);
                             $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon);
                             $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS);
                             $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID);
                             $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG);
 
-                            $('#'+SN.C.S.NoticeGeoName)
-                                .replaceWith('<a id="notice_data-geo_name"/>');
-
-                            $('#'+SN.C.S.NoticeGeoName)
-                                .attr('href', cookieValue.NLNU)
-                                .text(cookieValue.NLN)
-                                .click(function() {
-                                    window.open($(this).attr('href'));
-
-                                    return false;
-                                });
+                            $('label[for='+SN.C.S.NoticeDataGeo+']')
+                                .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
+                                .addClass('checked');
                         }
                     }
                     else {
diff --git a/lib/noticeform.php b/lib/noticeform.php
index a00615ce7..62df5c941 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -213,7 +213,6 @@ class NoticeForm extends Form
                 $this->out->elementEnd('div');
                 $this->out->inlineScript(' var NoticeDataGeo_text = {'.
                     'ShareDisable: "'._('Do not share my location').'",'.
-                    'InfoMinimize: "'._('Hide this info').'",'.
                     'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'.
                     '}');
             }
diff --git a/scripts/initializeinbox.php b/scripts/initializeinbox.php
index 43afc48eb..bc31cba15 100644
--- a/scripts/initializeinbox.php
+++ b/scripts/initializeinbox.php
@@ -20,17 +20,18 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i:n:af';
-$longoptions = array('id=', 'nickname=', 'all', 'force');
+$shortoptions = 'i:n:af:';
+$longoptions = array('id=', 'nickname=', 'all', 'file=');
 
 $helptext = <<<END_OF_INITIALIZEINBOX_HELP
 initializeinbox.php [options]
 initialize the inbox for a user
 
-  -i --id       ID of user to update
-  -n --nickname nickname of the user to update
-  -f --force    force update even if user already has a location
-  -a --all      update all
+  -i --id         ID of user to update
+  -n --nickname   nickname of the user to update
+  -f FILENAME     read list of IDs from FILENAME (1 per line)
+  --file=FILENAME ditto
+  -a --all        update all
 
 END_OF_INITIALIZEINBOX_HELP;
 
@@ -60,6 +61,21 @@ try {
                 initializeInbox($user);
             }
         }
+    } else if (have_option('f', 'file')) {
+        $filename = get_option_value('f', 'file');
+        if (!file_exists($filename)) {
+            throw new Exception("No such file '$filename'.");
+        } else if (!is_readable($filename)) {
+            throw new Exception("Can't read '$filename'.");
+        }
+        $ids = file($filename);
+        foreach ($ids as $id) {
+            $user = User::staticGet('id', $id);
+            if (empty($user)) {
+                throw new Exception("Can't find user with id '$id'.");
+            }
+            initializeInbox($user);
+        }
     } else {
         show_help();
         exit(1);
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e89661637..2e4c88dfa 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -554,27 +554,19 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code,
-.form_notice #notice_data-geo_name {
+.form_notice #notice_data-attach_selected code {
 float:left;
 width:80%;
 display:block;
 overflow:auto;
 margin-right:2.5%;
-}
-.form_notice #notice_data-attach_selected code {
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close,
-.form_notice #notice_data-geo_selected button.close {
+.form_notice #notice_data-attach_selected button.close {
 float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_selected button.minimize {
-float:left;
-}
-
 .form_notice #notice_data-geo_wrap label {
 position:absolute;
 top:25px;
@@ -594,10 +586,6 @@ font-size:1em;
 margin-bottom:0;
 text-indent:-9999px;
 }
-.form_notice #notice_data-geo_name {
-display:block;
-padding-left:21px;
-}
 
 button.close,
 button.minimize {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 2360976e5..8a2c01175 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -111,12 +111,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
-.form_notice span#notice_data-geo_name {
-background-position:0 47%;
-}
-.form_notice a#notice_data-geo_name {
-background-position:0 -1711px;
-}
 .form_notice label[for=notice_data-geo] {
 background-position:0 -1780px;
 }
@@ -192,7 +186,6 @@ button.close,
 .entity_silence input.submit,
 .entity_delete input.submit,
 .notice-options .repeated,
-.form_notice a#notice_data-geo_name,
 .form_notice label[for=notice_data-geo],
 button.minimize {
 background-image:url(../../base/images/icons/icons-01.gif);
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 91af1d8ec..4ee48459d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -111,12 +111,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
-.form_notice span#notice_data-geo_name {
-background-position:0 47%;
-}
-.form_notice a#notice_data-geo_name {
-background-position:0 -1711px;
-}
 .form_notice label[for=notice_data-geo] {
 background-position:0 -1780px;
 }
@@ -192,7 +186,6 @@ button.close,
 .entity_silence input.submit,
 .entity_delete input.submit,
 .notice-options .repeated,
-.form_notice a#notice_data-geo_name,
 .form_notice label[for=notice_data-geo],
 button.minimize {
 background-image:url(../../base/images/icons/icons-01.gif);