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

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

This commit is contained in:
Rudi Grinberg 2012-10-02 14:48:51 -04:00
parent b41c03902e 968c719fa1
commit 76c66737c5
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View File

@ -4,10 +4,10 @@
<dl class='zend_form search-criteria'> <dl class='zend_form search-criteria'>
<div class='btn-toolbar clearfix'> <div class='btn-toolbar clearfix'>
<div class='btn-group pull-right'> <div class='btn-group sp-button'>
<?php echo $this->element->getElement('generate_button') ?> <?php echo $this->element->getElement('generate_button') ?>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group sp-button'>
<?php echo $this->element->getElement('shuffle_button') ?> <?php echo $this->element->getElement('shuffle_button') ?>
</div> </div>
</div> </div>

6
airtime_mvc/public/css/styles.css
View File

@ -561,11 +561,7 @@ input.input_text.sp_extra_input_text{
} }
.sp-button{ .sp-button{
float: right !important; margin-left: 399px;
width: 60px;
height: 24px !important;
margin-right: 0px !important;
margin-left: 10px !important;
} }
.sp-save{ .sp-save{

1
airtime_mvc/public/js/airtime/library/library.js
View File

@ -1174,6 +1174,7 @@ var validationTypes = {
"composer" : "s", "composer" : "s",
"conductor" : "s", "conductor" : "s",
"copyright" : "s", "copyright" : "s",
"encoded_by" : "s",
"utime" : "t", "utime" : "t",
"mtime" : "t", "mtime" : "t",
"lptime" : "t", "lptime" : "t",