Merge branch 'testing' into filesize

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 10c82ebfd72d722d644e5860428d33854a59b35f..c81c024081cca174618ce6f5f00abfc577356c67 100644 (file)
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -157,13 +157,13 @@ class AvatarsettingsAction extends AccountSettingsAction
             }
 
             $this->elementStart('li', array ('id' => 'settings_attach'));
-            $this->element('input', array('name' => 'avatarfile',
-                                          'type' => 'file',
-                                          'id' => 'avatarfile'));
             $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                           'type' => 'hidden',
                                           'id' => 'MAX_FILE_SIZE',
                                           'value' => ImageFile::maxFileSizeInt()));
+            $this->element('input', array('name' => 'avatarfile',
+                                          'type' => 'file',
+                                          'id' => 'avatarfile'));
             $this->elementEnd('li');
             $this->elementEnd('ul');
 

diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index dd422bce91e0c0d66ee9ee18f101a38300768107..34e6de851a936d1b0cd04d48589783098a56df21 100644 (file)
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -516,6 +516,10 @@ class DesignAdminPanelForm extends AdminForm
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
+        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
+                                          'type' => 'hidden',
+                                          'id' => 'MAX_FILE_SIZE',
+                                          'value' => ImageFile::maxFileSizeInt()));
         $this->out->element('label', array('for' => 'design_background-image_file'),
                                // TRANS: Field label for background image on theme designer page.
                                 _('Background'));
@@ -526,10 +530,6 @@ class DesignAdminPanelForm extends AdminForm
             // TRANS: Form guide for background image upload form on theme designer page.
             sprintf(_('You can upload a background image for the site. ' .
               'The maximum file size is %1$s.'), ImageFile::maxFileSize()));
-        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
-                                          'type' => 'hidden',
-                                          'id' => 'MAX_FILE_SIZE',
-                                          'value' => ImageFile::maxFileSizeInt()));
         $this->unli();
 
         if (!empty($design->backgroundimage)) {

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index d2e8fd0e91bf290dda890e154ee238b1add0d759..e4a497cf8faafbbe4815c7e2a82868a0c8bb73b8 100644 (file)
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -228,13 +228,13 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         $this->elementStart('li', array ('id' => 'settings_attach'));
-        $this->element('input', array('name' => 'avatarfile',
-                                      'type' => 'file',
-                                      'id' => 'avatarfile'));
         $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',
                                       'value' => ImageFile::maxFileSizeInt()));
+        $this->element('input', array('name' => 'avatarfile',
+                                      'type' => 'file',
+                                      'id' => 'avatarfile'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 

diff --git a/db/notice_source.sql b/db/notice_source.sql
index b13cfb3e3b8cf835bb15fa467aed672bf101e2f4..dec8080a01a901bb5e1b66fdca41e6afd62d35e3 100644 (file)
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -24,6 +24,7 @@ VALUES
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
     ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
+    ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),

diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php
index f53c31feb42d270b74a88269e5c6fe32d4287287..ec6702cd647ee082cc2daaf89c0890eaaa125bf4 100644 (file)
--- a/lib/applicationeditform.php
+++ b/lib/applicationeditform.php
@@ -168,6 +168,10 @@ class ApplicationEditForm extends Form
             $this->out->element('img', array('src' => $icon));
         }
 
+        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
+                                           'type' => 'hidden',
+                                           'id' => 'MAX_FILE_SIZE',
+                                           'value' => ImageFile::maxFileSizeInt()));
         $this->out->element('label', array('for' => 'app_icon'),
                             // TRANS: Form input field label for application icon.
                             _('Icon'));
@@ -176,10 +180,6 @@ class ApplicationEditForm extends Form
                                            'id' => 'app_icon'));
         // TRANS: Form guide.
         $this->out->element('p', 'form_guide', _('Icon for this application'));
-        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
-                                           'type' => 'hidden',
-                                           'id' => 'MAX_FILE_SIZE',
-                                           'value' => ImageFile::maxFileSizeInt()));
         $this->out->elementEnd('li');
 
         $this->out->elementStart('li');

diff --git a/lib/designsettings.php b/lib/designsettings.php
index 90296a64da60066d66013e0d1b15c7899254e818..d7da0b77d8cf3ca2811e1c35c8ce0d05c7d3c7b9 100644 (file)
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -98,6 +98,10 @@ class DesignSettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Change background image'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
+        $this->element('input', array('name' => 'MAX_FILE_SIZE',
+                                      'type' => 'hidden',
+                                      'id' => 'MAX_FILE_SIZE',
+                                      'value' => ImageFile::maxFileSizeInt()));
         $this->element('label', array('for' => 'design_background-image_file'),
                                 // TRANS: Label in form on profile design page.
                                 // TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
@@ -108,10 +112,6 @@ class DesignSettingsAction extends AccountSettingsAction
         // TRANS: Instructions for form on profile design page.
         $this->element('p', 'form_guide', _('You can upload your personal ' .
             'background image. The maximum file size is 2MB.'));
-        $this->element('input', array('name' => 'MAX_FILE_SIZE',
-                                      'type' => 'hidden',
-                                      'id' => 'MAX_FILE_SIZE',
-                                      'value' => ImageFile::maxFileSizeInt()));
         $this->elementEnd('li');
 
         if (!empty($design->backgroundimage)) {

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 514066356933ad0a32400a8b73e74a37b9c9d1fa..271d3607075aaf03ba84d84ba8a64c6b5bd2fbcd 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -190,12 +190,12 @@ class NoticeForm extends Form
             }
 
             if (common_config('attachments', 'uploads')) {
+                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
                 $this->out->element('input', array('id' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    'title' => _('Attach a file')));
-                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');

diff --git a/plugins/Bookmark/bookmark.css b/plugins/Bookmark/bookmark.css
index 6743622d2f29b99010bef9e7a0bc7b1402eb1154..0e2f3df52f0fc4319feba48112b9948b06122dec 100644 (file)
--- a/plugins/Bookmark/bookmark.css
+++ b/plugins/Bookmark/bookmark.css
@@ -3,4 +3,6 @@
 .bookmark-avatar { float: left; }
 .bookmark-notice-count { float: right; }
 .bookmark-info { float: left; }
-.bookmark-title { margin-left: 0px }
+.bookmark-title { margin-left: 0px; }
+#content .bookmark .entry-title { margin-left: 0px; }
+#content .bookmark .entry-content { margin-left: 0px; }

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index b042bf7edd64fc304d2d0dfdd15a06eb11135789..b50440682f70c532132193bdc5dcf6ea6e190ea8 100644 (file)
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -358,12 +358,12 @@ class MobileProfilePlugin extends WAP20Plugin
 
         if (common_config('attachments', 'uploads')) {
             if ($this->mobileFeatures['inputfiletype']) {
+                $form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 $form->out->element('label', array('for' => 'notice_data-attach'), _m('Attach'));
                 $form->out->element('input', array('id' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    'title' => _m('Attach a file')));
-                $form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
         }
         if ($form->action) {

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8c364febce5c15d8be944e788b8ff58e81fd89c1..3268aea39be0bffa884774f39dd764d584abcf7b 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -346,14 +346,12 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
-border-radius-topleft:4px;
-border-radius-topright:4px;
+border-top-left-radius:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-topleft:0;
-border-radius-topright:0;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -381,13 +379,13 @@ display:block;
 width:80%;
 padding-right:10%;
 padding-left:10%;
-border-radius-toprleft:0;
+border-top-left-radius:0;
 -moz-border-radius-topleft:0;
 -webkit-border-top-left-radius:0;
-border-radius-topright:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-bottomright:4px;
+border-bottom-right-radius:4px;
 -moz-border-radius-bottomright:4px;
 -webkit-border-bottom-right-radius:4px;
 }
@@ -398,13 +396,10 @@ box-shadow:none;
 }
 
 body[id$=adminpanel] #content {
-border-radius-topleft:7px;
-border-radius-topright:7px;
+border-top-left-radius:7px;
 -moz-border-radius-topleft:7px;
--moz-border-radius-topright:7px;
 -webkit-border-top-left-radius:7px;
--webkit-border-top-right-radius:7px;
-border-radius-topright:0;
+border-top-right-radius:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
 }
@@ -488,6 +483,7 @@ min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
+border-top-left-radius:0;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;

diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index ab75165670b0d304ec85ea7462aef7433657443b..d4576092a6c310640d7b5080e2b9ac9396e807ad 100644 (file)
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -1399,7 +1399,7 @@ display:block;
     padding: 4px 4px 4px 26px;
 }
 
-.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input {
+.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input {
     background-color: #ccc !important;
     border: none;
 }
@@ -1408,7 +1408,7 @@ display:block;
     padding: 2px 4px 4px 28px;
 }
 
-.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover {
+.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover {
     background-color: #f2f2f2 !important;
 }
 

diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index 758d462ba019cfce04a7c50668383c21548e74b5..cb4625093a43b48986b0b77ac4bfee00e97ba5d0 100644 (file)
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -295,8 +295,8 @@ h6 {font-size: 1em;}
 #site_nav_local_views {\r
        position: relative;\r
        z-index: 9;\r
-       float: right;\r
-    margin: 0px 0px 20px 0px;
+       float: right;
+    margin: 0px;
     width: 290px;
 }\r
 \r
@@ -331,7 +331,7 @@ h6 {font-size: 1em;}
 }
 
 #site_nav_local_views li:first-child a {
-       border-radius-topright:4px;\r
+       border-top-right-radius:4px;\r
        -moz-border-radius-topright:4px;
        -webkit-border-top-right-radius:4px;
 }\r
@@ -368,7 +368,7 @@ h6 {font-size: 1em;}
        border-radius: 4px;
        -moz-border-radius: 4px;
        -webkit-border-radius: 4px;
-       border-radius-topright: 0px;\r
+       border-top-right-radius: 0px;\r
        -moz-border-radius-topright: 0px;
        -webkit-border-top-right-radius: 0px;
     padding: 14px 10px 20px 10px;
@@ -382,9 +382,8 @@ h6 {font-size: 1em;}
        padding: 0px;
     padding-top: 16px;
     padding-left: 10px;
-    margin-top: -20px;
     background-color: #262626;
-       border-radius-bottomright: 6px;\r
+       border-bottom-right-radius: 6px;\r
        -moz-border-radius-bottomright: 6px;
        -webkit-border-bottom-right-radius: 6px;
 }