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

CC-6070 - standardize editor buttons

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-17 18:34:39 -04:00
parent 096c96b1b6
commit 4adb9cc55a
6 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/application/forms/EditAudioMD.php
View file

@ -172,7 +172,7 @@ class Application_Form_EditAudioMD extends Zend_Form
// Add the submit button // Add the submit button
$this->addElement('button', 'editmdsave', array( $this->addElement('button', 'editmdsave', array(
'ignore' => true, 'ignore' => true,
'class' => 'btn btn-small md-save', 'class' => 'btn md-save right-floated',
'label' => _('Save'), 'label' => _('Save'),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -182,7 +182,7 @@ class Application_Form_EditAudioMD extends Zend_Form
// Add the submit button // Add the submit button
$this->addElement('button', 'editmdcancel', array( $this->addElement('button', 'editmdcancel', array(
'ignore' => true, 'ignore' => true,
'class' => 'btn btn-small md-cancel', 'class' => 'btn md-cancel right-floated',
'label' => _('Cancel'), 'label' => _('Cancel'),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -190,10 +190,10 @@ class Application_Form_EditAudioMD extends Zend_Form
)); ));
$this->addDisplayGroup(array('editmdsave', 'editmdcancel'), 'submitButtons', array( $this->addDisplayGroup(array('editmdsave', 'editmdcancel'), 'submitButtons', array(
'decorators' => array( 'decorators' => array(
'FormElements', 'FormElements',
'DtDdWrapper' 'DtDdWrapper'
) )
)); ));
} }

5
airtime_mvc/application/views/scripts/playlist/_playlist.phtml
View file

@ -58,8 +58,11 @@ if (isset($this->obj)) {
echo $this->render('playlist/update.phtml') ?> echo $this->render('playlist/update.phtml') ?>
</ul> </ul>
<div class="btn-toolbar spl-no-margin clearfix"> <div class="btn-toolbar spl-no-margin clearfix">
<div class="btn-group pull-right">
<button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
</div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button> <button class="btn" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
</div> </div>
</div> </div>

5
airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
View file

@ -59,8 +59,11 @@ if (isset($this->obj)) {
echo $this->render('playlist/update.phtml') ?> echo $this->render('playlist/update.phtml') ?>
</ul> </ul>
<div class="btn-toolbar spl-no-margin clearfix"> <div class="btn-toolbar spl-no-margin clearfix">
<div class="btn-group pull-right">
<button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
</div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button> <button class="btn" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
</div> </div>
</div> </div>

5
airtime_mvc/application/views/scripts/webstream/_webstream.phtml
View file

@ -35,7 +35,10 @@
<div class="btn-toolbar spl-no-margin clearfix"> <div class="btn-toolbar spl-no-margin clearfix">
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button> <button class="btn" type="button" id="webstream_cancel" name="submit"><?php echo _("Cancel") ?></button>
</div>
<div class="btn-group pull-right">
<button class="btn" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
</div> </div>
</div> </div>

26
airtime_mvc/public/css/_showbuilder.css
View file

@ -567,23 +567,27 @@ li.ui-state-default {
padding: 4px; padding: 4px;
} }
#save_button, #webstream_save { /*#save_button, #webstream_save {*/
background: #ff5d1a; /*background: #ff5d1a;*/
color: #fff; /*color: #fff;*/
border-radius: 4px; /*border-radius: 4px;*/
font-size: 16px; /*font-size: 16px;*/
height: 38px; /*height: 38px;*/
width: 120px; /*width: 120px;*/
} /*}*/
#save_button:active, #webstream_save { /*#save_button:active, #webstream_save {*/
color: #fff !important; /*color: #fff !important;*/
} /*}*/
#save_button:focus, #webstream_save { #save_button:focus, #webstream_save {
outline-width: 0; outline-width: 0;
} }
#edit-md-dialog .zend_form dd:last-child {
width: 160px;
}
/* Smart Block Editor */ /* Smart Block Editor */
.btn-toolbar { .btn-toolbar {

5
airtime_mvc/public/js/airtime/library/_spl.js
View file

@ -904,6 +904,11 @@ var AIRTIME = (function(AIRTIME){
}); });
$pl.find("#webstream_cancel, #cancel_button").on("click", function() {
var tabId = $pl.attr("tab-id");
$("li[tab-id=" + tabId + "] .lib_pl_close").click();
});
$lib.on("click", "#pl_edit", function() { $lib.on("click", "#pl_edit", function() {
openPlaylistPanel(); openPlaylistPanel();
$.ajax({ $.ajax({