Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Yuchen Wang 2011-12-05 12:12:19 -05:00
parent 9b4d442d52 beab24d068
commit f5405151dc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/SupportSettings.php
View File

@ -106,7 +106,7 @@ class Application_Form_SupportSettings extends Zend_Form
->addValidator('Count', false, 1) ->addValidator('Count', false, 1)
->addValidator('Extension', false, 'jpg,jpeg,png,gif') ->addValidator('Extension', false, 'jpg,jpeg,png,gif')
->addFilter('ImageSize'); ->addFilter('ImageSize');
$upload->setAttrib('accept', 'image/jpeg,image/gif,image/png,image/jpg'); $upload->setAttrib('accept', 'image/*');
$this->addElement($upload); $this->addElement($upload);
if(!$isSass){ if(!$isSass){

5
airtime_mvc/public/css/playlist_builder.css
View File

@ -374,6 +374,7 @@
-webkit-box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1);
box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1);
width:95%; width:95%;
margin-bottom:10px;
} }
#side_playlist .zend_form { #side_playlist .zend_form {
@ -444,4 +445,6 @@ fieldset > legend {
#side_playlist .zend_form input, #side_playlist .zend_form textarea { #side_playlist .zend_form input, #side_playlist .zend_form textarea {
width: auto; width: auto;
} }
#fieldset-metadate_change {
clear:both;
}