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

crlf

This commit is contained in:
Naomi Aro 2013-08-19 23:20:26 -04:00
parent 09693ef174
commit 3ea2b920a6
3 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/controllers/PlayouthistoryController.php
View File

@ -83,24 +83,24 @@ class PlayouthistoryController extends Zend_Controller_Action
$this->view->headScript()->appendScript($script); $this->view->headScript()->appendScript($script);
} }
public function contextMenuAction() public function contextMenuAction()
{ {
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$id = $this->_getParam('id'); $id = $this->_getParam('id');
$menu = array(); $menu = array();
$menu["edit"] = array( $menu["edit"] = array(
"name"=> _("Edit"), "name"=> _("Edit"),
"icon" => "edit", "icon" => "edit",
"url" => $baseUrl."playouthistory/edit-list-item/id/{$id}" "url" => $baseUrl."playouthistory/edit-list-item/id/{$id}"
); );
$menu["del"] = array( $menu["del"] = array(
"name"=> _("Delete"), "name"=> _("Delete"),
"icon" => "delete", "icon" => "delete",
"url" => $baseUrl."playouthistory/delete-list-item/id/{$id}" "url" => $baseUrl."playouthistory/delete-list-item/id/{$id}"
); );
$this->view->items = $menu; $this->view->items = $menu;
} }

2
airtime_mvc/application/services/HistoryService.php
View File

@ -1054,7 +1054,7 @@ class Application_Service_HistoryService
try { try {
$template = $this->getConfiguredItemTemplate(); $template = $this->getConfiguredItemTemplate();
$fields = $template["fields"]; $fields = $template["fields"];
$columns = $this->datatablesColumns($fields); $columns = $this->datatablesColumns($fields);
array_unshift($columns, $checkbox); array_unshift($columns, $checkbox);

238
airtime_mvc/public/css/history_styles.css
View File

@ -1,120 +1,120 @@
#history_template h4, #configure_item_template h4 { font-size: 14px; margin-top: 0px; } #history_template h4, #configure_item_template h4 { font-size: 14px; margin-top: 0px; }
#history_template ul, #configure_item_template ul { list-style: none; padding-left: 0px; } #history_template ul, #configure_item_template ul { list-style: none; padding-left: 0px; }
#history_template li, #configure_item_template li { #history_template li, #configure_item_template li {
clear: both; clear: both;
background: #AAAAAA; background: #AAAAAA;
margin: 2px 0 4px 0; margin: 2px 0 4px 0;
padding: 4px 8px 4px 8px; padding: 4px 8px 4px 8px;
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border: 1px solid #9F9F9F; border: 1px solid #9F9F9F;
min-height: 15px; min-height: 15px;
} }
#history_template li a, #configure_item_template li a { #history_template li a, #configure_item_template li a {
text-decoration: none; text-decoration: none;
} }
#history_template li a:hover, #configure_item_template li a:hover { #history_template li a:hover, #configure_item_template li a:hover {
text-decoration: underline; text-decoration: underline;
} }
#history_template li .template_name { #history_template li .template_name {
float: left; float: left;
} }
#history_template li.template_configured { #history_template li.template_configured {
background: #9A9A9A; background: #9A9A9A;
border: 1px solid #858585; border: 1px solid #858585;
} }
#history_template .template_remove, #history_template .template_default { #history_template .template_remove, #history_template .template_default {
float: right; float: right;
margin-left: 10px; margin-left: 10px;
} }
#history_template .template_default { #history_template .template_default {
margin-left: 20px; margin-left: 20px;
} }
#history_template .icon-ok { #history_template .icon-ok {
right: 10px; right: 10px;
margin-left: 10px; margin-left: 10px;
position: absolute; position: absolute;
} }
#configure_item_template li span { #configure_item_template li span {
cursor: move; cursor: move;
padding-left: 6px; padding-left: 6px;
} }
#configure_item_template li .template_item_remove, #configure_item_template li .field_add { #configure_item_template li .template_item_remove, #configure_item_template li .field_add {
cursor: pointer; cursor: pointer;
float: right; float: right;
margin-left: 20px; margin-left: 20px;
} }
#configure_item_template li .template_item_remove:hover, #configure_item_template li .field_add:hover { #configure_item_template li .template_item_remove:hover, #configure_item_template li .field_add:hover {
opacity:0.7; opacity:0.7;
filter:alpha(opacity=70); filter:alpha(opacity=70);
} }
#configure_item_template #template_name { #configure_item_template #template_name {
min-width: 230px; min-width: 230px;
float: right; float: right;
} }
#configure_item_template .template_name_wrap { #configure_item_template .template_name_wrap {
display: inline-block; display: inline-block;
} }
#configure_item_template label { #configure_item_template label {
vertical-align: middle; vertical-align: middle;
} }
#configure_item_template .template_item_add { #configure_item_template .template_item_add {
margin-bottom: 10px; margin-bottom: 10px;
} }
#configure_item_template .template_item_add .btn { #configure_item_template .template_item_add .btn {
padding: 2px 14px 1px; padding: 2px 14px 1px;
} }
#configure_item_template .template_item_list li { #configure_item_template .template_item_list li {
background-image: url('../css/images/drag.png'); background-image: url('../css/images/drag.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 4px 5px; background-position: 4px 5px;
} }
/* Bootstrap calendar /* Bootstrap calendar
.bootstrap-datetimepicker-widget ul { .bootstrap-datetimepicker-widget ul {
padding-left: 0px !important; padding-left: 0px !important;
} }
.bootstrap-datetimepicker-widget td, .bootstrap-datetimepicker-widget th { .bootstrap-datetimepicker-widget td, .bootstrap-datetimepicker-widget th {
-webkit-border-radius: 2px !important; -webkit-border-radius: 2px !important;
-moz-border-radius: 2px !important; -moz-border-radius: 2px !important;
border-radius: 2px !important; border-radius: 2px !important;
} }
*/ */
/* Edit History Record */ /* Edit History Record */
.ui-dialog form.ui-widget-content dd { .ui-dialog form.ui-widget-content dd {
margin-left: 0px; margin-left: 0px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.ui-dialog form.ui-widget-content dt { .ui-dialog form.ui-widget-content dt {
margin-bottom: 2px; margin-bottom: 2px;
} }
.ui-dialog form.ui-widget-content dd input { .ui-dialog form.ui-widget-content dd input {
width: 190px; width: 190px;
} }