From 3ea2b920a61508fee4efc163f3e605d44c4261cc Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 19 Aug 2013 23:20:26 -0400 Subject: [PATCH] crlf --- .../controllers/PlayouthistoryController.php | 14 +- .../application/services/HistoryService.php | 2 +- airtime_mvc/public/css/history_styles.css | 238 +++++++++--------- 3 files changed, 127 insertions(+), 127 deletions(-) diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php index 05d8d841d..0c04481f2 100644 --- a/airtime_mvc/application/controllers/PlayouthistoryController.php +++ b/airtime_mvc/application/controllers/PlayouthistoryController.php @@ -83,24 +83,24 @@ class PlayouthistoryController extends Zend_Controller_Action $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'); $menu = array(); - $menu["edit"] = array( - "name"=> _("Edit"), - "icon" => "edit", - "url" => $baseUrl."playouthistory/edit-list-item/id/{$id}" + $menu["edit"] = array( + "name"=> _("Edit"), + "icon" => "edit", + "url" => $baseUrl."playouthistory/edit-list-item/id/{$id}" ); $menu["del"] = array( "name"=> _("Delete"), "icon" => "delete", "url" => $baseUrl."playouthistory/delete-list-item/id/{$id}" - ); + ); $this->view->items = $menu; } diff --git a/airtime_mvc/application/services/HistoryService.php b/airtime_mvc/application/services/HistoryService.php index 4890053e3..a2ae5b6b6 100644 --- a/airtime_mvc/application/services/HistoryService.php +++ b/airtime_mvc/application/services/HistoryService.php @@ -1054,7 +1054,7 @@ class Application_Service_HistoryService try { $template = $this->getConfiguredItemTemplate(); - $fields = $template["fields"]; + $fields = $template["fields"]; $columns = $this->datatablesColumns($fields); array_unshift($columns, $checkbox); diff --git a/airtime_mvc/public/css/history_styles.css b/airtime_mvc/public/css/history_styles.css index b833ff94e..4e6a5ede8 100644 --- a/airtime_mvc/public/css/history_styles.css +++ b/airtime_mvc/public/css/history_styles.css @@ -1,120 +1,120 @@ -#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 li, #configure_item_template li { - clear: both; - background: #AAAAAA; - margin: 2px 0 4px 0; - padding: 4px 8px 4px 8px; - position: relative; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border: 1px solid #9F9F9F; - min-height: 15px; -} - -#history_template li a, #configure_item_template li a { - text-decoration: none; -} - -#history_template li a:hover, #configure_item_template li a:hover { - text-decoration: underline; -} - -#history_template li .template_name { - float: left; -} - -#history_template li.template_configured { - background: #9A9A9A; - border: 1px solid #858585; -} - -#history_template .template_remove, #history_template .template_default { - float: right; - margin-left: 10px; -} - -#history_template .template_default { - margin-left: 20px; -} - -#history_template .icon-ok { - right: 10px; - margin-left: 10px; - position: absolute; -} - -#configure_item_template li span { - cursor: move; - padding-left: 6px; -} - -#configure_item_template li .template_item_remove, #configure_item_template li .field_add { - cursor: pointer; - float: right; - margin-left: 20px; -} - -#configure_item_template li .template_item_remove:hover, #configure_item_template li .field_add:hover { - opacity:0.7; - filter:alpha(opacity=70); -} - -#configure_item_template #template_name { - min-width: 230px; - float: right; -} - -#configure_item_template .template_name_wrap { - display: inline-block; -} - -#configure_item_template label { - vertical-align: middle; -} - -#configure_item_template .template_item_add { - margin-bottom: 10px; -} - -#configure_item_template .template_item_add .btn { - padding: 2px 14px 1px; -} - -#configure_item_template .template_item_list li { - background-image: url('../css/images/drag.png'); - background-repeat: no-repeat; - background-position: 4px 5px; -} - -/* Bootstrap calendar - -.bootstrap-datetimepicker-widget ul { - padding-left: 0px !important; -} - -.bootstrap-datetimepicker-widget td, .bootstrap-datetimepicker-widget th { - -webkit-border-radius: 2px !important; - -moz-border-radius: 2px !important; - border-radius: 2px !important; -} - -*/ - -/* Edit History Record */ - -.ui-dialog form.ui-widget-content dd { - margin-left: 0px; - margin-bottom: 10px; -} - -.ui-dialog form.ui-widget-content dt { - margin-bottom: 2px; -} - -.ui-dialog form.ui-widget-content dd input { - width: 190px; +#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 li, #configure_item_template li { + clear: both; + background: #AAAAAA; + margin: 2px 0 4px 0; + padding: 4px 8px 4px 8px; + position: relative; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border: 1px solid #9F9F9F; + min-height: 15px; +} + +#history_template li a, #configure_item_template li a { + text-decoration: none; +} + +#history_template li a:hover, #configure_item_template li a:hover { + text-decoration: underline; +} + +#history_template li .template_name { + float: left; +} + +#history_template li.template_configured { + background: #9A9A9A; + border: 1px solid #858585; +} + +#history_template .template_remove, #history_template .template_default { + float: right; + margin-left: 10px; +} + +#history_template .template_default { + margin-left: 20px; +} + +#history_template .icon-ok { + right: 10px; + margin-left: 10px; + position: absolute; +} + +#configure_item_template li span { + cursor: move; + padding-left: 6px; +} + +#configure_item_template li .template_item_remove, #configure_item_template li .field_add { + cursor: pointer; + float: right; + margin-left: 20px; +} + +#configure_item_template li .template_item_remove:hover, #configure_item_template li .field_add:hover { + opacity:0.7; + filter:alpha(opacity=70); +} + +#configure_item_template #template_name { + min-width: 230px; + float: right; +} + +#configure_item_template .template_name_wrap { + display: inline-block; +} + +#configure_item_template label { + vertical-align: middle; +} + +#configure_item_template .template_item_add { + margin-bottom: 10px; +} + +#configure_item_template .template_item_add .btn { + padding: 2px 14px 1px; +} + +#configure_item_template .template_item_list li { + background-image: url('../css/images/drag.png'); + background-repeat: no-repeat; + background-position: 4px 5px; +} + +/* Bootstrap calendar + +.bootstrap-datetimepicker-widget ul { + padding-left: 0px !important; +} + +.bootstrap-datetimepicker-widget td, .bootstrap-datetimepicker-widget th { + -webkit-border-radius: 2px !important; + -moz-border-radius: 2px !important; + border-radius: 2px !important; +} + +*/ + +/* Edit History Record */ + +.ui-dialog form.ui-widget-content dd { + margin-left: 0px; + margin-bottom: 10px; +} + +.ui-dialog form.ui-widget-content dt { + margin-bottom: 2px; +} + +.ui-dialog form.ui-widget-content dd input { + width: 190px; } \ No newline at end of file