GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' into filesize

Browse Source
This commit is contained in:
Brion Vibber 2011-01-26 15:53:05 -08:00
commit ea4ebe280a
12 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/avatarsettings.php
View File

@ -157,13 +157,13 @@ class AvatarsettingsAction extends AccountSettingsAction
} }
$this->elementStart('li', array ('id' => 'settings_attach')); $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', $this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden', 'type' => 'hidden',
'id' => 'MAX_FILE_SIZE', 'id' => 'MAX_FILE_SIZE',
'value' => ImageFile::maxFileSizeInt())); 'value' => ImageFile::maxFileSizeInt()));
$this->element('input', array('name' => 'avatarfile',
'type' => 'file',
'id' => 'avatarfile'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');

8
actions/designadminpanel.php
View File

@ -516,6 +516,10 @@ class DesignAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $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'), $this->out->element('label', array('for' => 'design_background-image_file'),
// TRANS: Field label for background image on theme designer page. // TRANS: Field label for background image on theme designer page.
_('Background')); _('Background'));
@ -526,10 +530,6 @@ class DesignAdminPanelForm extends AdminForm
// TRANS: Form guide for background image upload form on theme designer page. // TRANS: Form guide for background image upload form on theme designer page.
sprintf(_('You can upload a background image for the site. ' . sprintf(_('You can upload a background image for the site. ' .
'The maximum file size is %1$s.'), ImageFile::maxFileSize())); '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(); $this->unli();
if (!empty($design->backgroundimage)) { if (!empty($design->backgroundimage)) {

6
actions/grouplogo.php
View File

@ -228,13 +228,13 @@ class GrouplogoAction extends GroupDesignAction
} }
$this->elementStart('li', array ('id' => 'settings_attach')); $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', $this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden', 'type' => 'hidden',
'id' => 'MAX_FILE_SIZE', 'id' => 'MAX_FILE_SIZE',
'value' => ImageFile::maxFileSizeInt())); 'value' => ImageFile::maxFileSizeInt()));
$this->element('input', array('name' => 'avatarfile',
'type' => 'file',
'id' => 'avatarfile'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');

1
db/notice_source.sql
View File

@ -24,6 +24,7 @@ VALUES
('HelloTxt','HelloTxt','http://hellotxt.com/', now()), ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
('identichat','identichat','http://identichat.prosody.im/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()),
('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()), ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),

8
lib/applicationeditform.php
View File

@ -168,6 +168,10 @@ class ApplicationEditForm extends Form
$this->out->element('img', array('src' => $icon)); $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'), $this->out->element('label', array('for' => 'app_icon'),
// TRANS: Form input field label for application icon. // TRANS: Form input field label for application icon.
_('Icon')); _('Icon'));
@ -176,10 +180,6 @@ class ApplicationEditForm extends Form
'id' => 'app_icon')); 'id' => 'app_icon'));
// TRANS: Form guide. // TRANS: Form guide.
$this->out->element('p', 'form_guide', _('Icon for this application')); $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->elementEnd('li');
$this->out->elementStart('li'); $this->out->elementStart('li');

8
lib/designsettings.php
View File

@ -98,6 +98,10 @@ class DesignSettingsAction extends AccountSettingsAction
$this->element('legend', null, _('Change background image')); $this->element('legend', null, _('Change background image'));
$this->elementStart('ul', 'form_data'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $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'), $this->element('label', array('for' => 'design_background-image_file'),
// TRANS: Label in form on profile design page. // 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. // 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. // TRANS: Instructions for form on profile design page.
$this->element('p', 'form_guide', _('You can upload your personal ' . $this->element('p', 'form_guide', _('You can upload your personal ' .
'background image. The maximum file size is 2MB.')); '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'); $this->elementEnd('li');
if (!empty($design->backgroundimage)) { if (!empty($design->backgroundimage)) {

2
lib/noticeform.php
View File

@ -190,12 +190,12 @@ class NoticeForm extends Form
} }
if (common_config('attachments', 'uploads')) { 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('label', array('for' => 'notice_data-attach'),_('Attach'));
$this->out->element('input', array('id' => 'notice_data-attach', $this->out->element('input', array('id' => 'notice_data-attach',
'type' => 'file', 'type' => 'file',
'name' => 'attach', 'name' => 'attach',
'title' => _('Attach a file'))); 'title' => _('Attach a file')));
$this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
} }
if ($this->action) { if ($this->action) {
$this->out->hidden('notice_return-to', $this->action, 'returnto'); $this->out->hidden('notice_return-to', $this->action, 'returnto');

4
plugins/Bookmark/bookmark.css
View File

@ -3,4 +3,6 @@
.bookmark-avatar { float: left; } .bookmark-avatar { float: left; }
.bookmark-notice-count { float: right; } .bookmark-notice-count { float: right; }
.bookmark-info { float: left; } .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; }

2
plugins/MobileProfile/MobileProfilePlugin.php
View File

@ -358,12 +358,12 @@ class MobileProfilePlugin extends WAP20Plugin
if (common_config('attachments', 'uploads')) { if (common_config('attachments', 'uploads')) {
if ($this->mobileFeatures['inputfiletype']) { 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('label', array('for' => 'notice_data-attach'), _m('Attach'));
$form->out->element('input', array('id' => 'notice_data-attach', $form->out->element('input', array('id' => 'notice_data-attach',
'type' => 'file', 'type' => 'file',
'name' => 'attach', 'name' => 'attach',
'title' => _m('Attach a file'))); 'title' => _m('Attach a file')));
$form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
} }
} }
if ($form->action) { if ($form->action) {

20
theme/base/css/display.css
View File

@ -346,14 +346,12 @@ list-style-type:none;
float:left; float:left;
text-decoration:none; text-decoration:none;
padding:4px 11px; padding:4px 11px;
border-radius-topleft:4px; border-top-left-radius:4px;
border-radius-topright:4px; border-top-right-radius:4px;
-moz-border-radius-topleft:4px; -moz-border-radius-topleft:4px;
-moz-border-radius-topright:4px; -moz-border-radius-topright:4px;
-webkit-border-top-left-radius:4px; -webkit-border-top-left-radius:4px;
-webkit-border-top-right-radius:4px; -webkit-border-top-right-radius:4px;
border-radius-topleft:0;
border-radius-topright:0;
border-width:1px; border-width:1px;
border-style:solid; border-style:solid;
border-bottom:0; border-bottom:0;
@ -381,13 +379,13 @@ display:block;
width:80%; width:80%;
padding-right:10%; padding-right:10%;
padding-left:10%; padding-left:10%;
border-radius-toprleft:0; border-top-left-radius:0;
-moz-border-radius-topleft:0; -moz-border-radius-topleft:0;
-webkit-border-top-left-radius:0; -webkit-border-top-left-radius:0;
border-radius-topright:4px; border-top-right-radius:4px;
-moz-border-radius-topright:4px; -moz-border-radius-topright:4px;
-webkit-border-top-right-radius:4px; -webkit-border-top-right-radius:4px;
border-radius-bottomright:4px; border-bottom-right-radius:4px;
-moz-border-radius-bottomright:4px; -moz-border-radius-bottomright:4px;
-webkit-border-bottom-right-radius:4px; -webkit-border-bottom-right-radius:4px;
} }
@ -398,13 +396,10 @@ box-shadow:none;
} }
body[id$=adminpanel] #content { body[id$=adminpanel] #content {
border-radius-topleft:7px; border-top-left-radius:7px;
border-radius-topright:7px;
-moz-border-radius-topleft:7px; -moz-border-radius-topleft:7px;
-moz-border-radius-topright:7px;
-webkit-border-top-left-radius:7px; -webkit-border-top-left-radius:7px;
-webkit-border-top-right-radius:7px; border-top-right-radius:0;
border-radius-topright:0;
-moz-border-radius-topright:0; -moz-border-radius-topright:0;
-webkit-border-top-right-radius:0; -webkit-border-top-right-radius:0;
} }
@ -488,6 +483,7 @@ min-height:259px;
padding:1.795%; padding:1.795%;
float:left; float:left;
border-radius:7px; border-radius:7px;
border-top-left-radius:0;
-moz-border-radius:7px; -moz-border-radius:7px;
-moz-border-radius-topleft:0; -moz-border-radius-topleft:0;
-webkit-border-radius:7px; -webkit-border-radius:7px;

4
theme/rebase/css/display.css
View File

@ -1399,7 +1399,7 @@ display:block;
padding: 4px 4px 4px 26px; 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; background-color: #ccc !important;
border: none; border: none;
} }
@ -1408,7 +1408,7 @@ display:block;
padding: 2px 4px 4px 28px; 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; background-color: #f2f2f2 !important;
} }

11
theme/shiny/css/display.css
View File

@ -295,8 +295,8 @@ h6 {font-size: 1em;}
#site_nav_local_views { #site_nav_local_views {
position: relative; position: relative;
z-index: 9; z-index: 9;
float: right; float: right;
margin: 0px 0px 20px 0px; margin: 0px;
width: 290px; width: 290px;
} }
@ -331,7 +331,7 @@ h6 {font-size: 1em;}
} }
#site_nav_local_views li:first-child a { #site_nav_local_views li:first-child a {
border-radius-topright:4px; border-top-right-radius:4px;
-moz-border-radius-topright:4px; -moz-border-radius-topright:4px;
-webkit-border-top-right-radius:4px; -webkit-border-top-right-radius:4px;
} }
@ -368,7 +368,7 @@ h6 {font-size: 1em;}
border-radius: 4px; border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius-topright: 0px; border-top-right-radius: 0px;
-moz-border-radius-topright: 0px; -moz-border-radius-topright: 0px;
-webkit-border-top-right-radius: 0px; -webkit-border-top-right-radius: 0px;
padding: 14px 10px 20px 10px; padding: 14px 10px 20px 10px;
@ -382,9 +382,8 @@ h6 {font-size: 1em;}
padding: 0px; padding: 0px;
padding-top: 16px; padding-top: 16px;
padding-left: 10px; padding-left: 10px;
margin-top: -20px;
background-color: #262626; background-color: #262626;
border-radius-bottomright: 6px; border-bottom-right-radius: 6px;
-moz-border-radius-bottomright: 6px; -moz-border-radius-bottomright: 6px;
-webkit-border-bottom-right-radius: 6px; -webkit-border-bottom-right-radius: 6px;
} }