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

CC-6069: Pick consistent design for New buttons

Browse source 
* First shot at blue New buttons
This commit is contained in:
Albert Santoni 2015-08-28 16:21:20 -04:00
parent 71f149f95f
commit 311956eb74
6 changed files with 20 additions and 7 deletions
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

@ -65,7 +65,7 @@
<dt><label><?php echo(_("Search Criteria:"));?></label></dt> <dt><label><?php echo(_("Search Criteria:"));?></label></dt>
<dd id='sp_criteria-element' class='criteria-element'> <dd id='sp_criteria-element' class='criteria-element'>
<a class='btn btn-small' id='criteria_add'><i class='icon-white icon-plus'></i><?php echo(_("New Criteria")); ?></a> <a class='btn btn-small btn-new' id='criteria_add'><i class='icon-white icon-plus'></i><?php echo(_("New Criteria")); ?></a>
<?php for ($i = 0; $i < $this->criteriasLength; $i++) { <?php for ($i = 0; $i < $this->criteriasLength; $i++) {
// modRowMap holds the number of modifier rows for each criteria element // modRowMap holds the number of modifier rows for each criteria element
@ -95,7 +95,7 @@
<?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
<?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?>
<?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
<a class='btn btn-small' id='modifier_add_<?php echo $i ?>'> <a class='btn btn-small btn-new' id='modifier_add_<?php echo $i ?>'>
<i class='icon-white icon-plus'></i><?php echo(_("New Modifier")); ?> <i class='icon-white icon-plus'></i><?php echo(_("New Modifier")); ?>
</a> </a>

4
airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml
View file

@ -3,7 +3,7 @@
<h2><?php echo(_("Playout History Templates"));?></h2> <h2><?php echo(_("Playout History Templates"));?></h2>
<div><h4><?php echo _("Log Sheet Templates") ?></h4></div> <div><h4><?php echo _("Log Sheet Templates") ?></h4></div>
<button id="new_item_template" class="btn"><?php echo _("New Log Sheet Template") ?></button> <button id="new_item_template" class="btn btn-new"><?php echo _("New Log Sheet Template") ?></button>
<ul id="template_list"> <ul id="template_list">
<?php if (count($this->template_list) == 0): ?> <?php if (count($this->template_list) == 0): ?>
<li><?php echo _("No Log Sheet Templates") ?></li> <li><?php echo _("No Log Sheet Templates") ?></li>
@ -34,7 +34,7 @@
<br><br> <br><br>
<div> <div>
<div><h4><?php echo _("File Summary Templates") ?></h4></div> <div><h4><?php echo _("File Summary Templates") ?></h4></div>
<button id="new_file_template" class="btn"><?php echo _("New File Summary Template") ?></button> <button id="new_file_template" class="btn btn-new"><?php echo _("New File Summary Template") ?></button>
<ul id="template_file"> <ul id="template_file">
<?php if (count($this->template_file) == 0): ?> <?php if (count($this->template_file) == 0): ?>
<li><?php echo _("No File Summary Templates") ?></li> <li><?php echo _("No File Summary Templates") ?></li>

13
airtime_mvc/public/css/styles.css
View file

@ -3298,6 +3298,19 @@ dd .stream-status {
outline: 0; outline: 0;
border-top-color:#333333 border-top-color:#333333
} }
.btn-new {
background: none;
background-color: #237686;
}
.btn-new:hover {
background: none;
background-color: #1c606e;
}
.btn-new[disabled]:hover {
background: inherit;
}
.dark_class .dark_class
{ {
background-color: black; background-color: black;

2
airtime_mvc/public/js/airtime/library/library.js
View file

@ -119,7 +119,7 @@ var AIRTIME = (function(AIRTIME) {
$menu $menu
.append( .append(
"<div class='btn-group' title=" + $.i18n._('New') + ">" + "<div class='btn-group' title=" + $.i18n._('New') + ">" +
"<button class='btn btn-small' id='sb-new'>" + "<button class='btn btn-small btn-new' id='sb-new'>" +
"<i class='icon-white icon-plus'></i>" + "<i class='icon-white icon-plus'></i>" +
"<span>" + $.i18n._('New') + "</span>" + "<span>" + $.i18n._('New') + "</span>" +
"</button>" + "</button>" +

2
airtime_mvc/public/js/airtime/playouthistory/historytable.js
View file

@ -292,7 +292,7 @@ var AIRTIME = (function(AIRTIME) {
var $menu = $("<div class='btn-toolbar' />"); var $menu = $("<div class='btn-toolbar' />");
$menu.append("<div class='btn-group'>" + $menu.append("<div class='btn-group'>" +
"<button class='btn btn-small' id='his_create'>" + "<button class='btn btn-small btn-new' id='his_create'>" +
"<i class='icon-white icon-plus'></i>" + "<i class='icon-white icon-plus'></i>" +
$.i18n._("New Log Entry") + $.i18n._("New Log Entry") +
"</button>" + "</button>" +

2
airtime_mvc/public/js/airtime/schedule/add-show.js
View file

@ -30,7 +30,7 @@ function makeAddShowButton() {
$('.fc-header-left') $('.fc-header-left')
.prepend('<span class="fc-header-space"></span>') .prepend('<span class="fc-header-space"></span>')
.prepend('<span class="btn-group">' + .prepend('<span class="btn-group">' +
'<button onclick="showForm()" class="add-button btn btn-small">' + '<button onclick="showForm()" class="add-button btn btn-small btn-new">' +
'<i class="icon-white icon-plus"></i>' + '<i class="icon-white icon-plus"></i>' +
'<span>' + $.i18n._("New Show") + '</span>' + '<span>' + $.i18n._("New Show") + '</span>' +
'</button>' + '</button>' +