From b357b80054b5d46370f8bb2968d6f2b9f4b84a13 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 23 Feb 2012 12:13:00 +0100 Subject: [PATCH] CC-3174 : showbuilder created controller Usersettings, noticed hosts couldn't save datatables setting through pref controller. starting to use new cursor arrows. --- airtime_mvc/application/configs/ACL.php | 6 +-- .../controllers/PreferenceController.php | 38 -------------- .../controllers/UsersettingsController.php | 49 ++++++++++++++++++ airtime_mvc/public/css/images/tl-arrow.png | Bin 0 -> 1019 bytes airtime_mvc/public/css/showbuilder.css | 24 +++++++-- .../public/js/airtime/library/library.js | 4 +- .../public/js/airtime/showbuilder/builder.js | 10 ++-- 7 files changed, 78 insertions(+), 53 deletions(-) create mode 100644 airtime_mvc/application/controllers/UsersettingsController.php create mode 100644 airtime_mvc/public/css/images/tl-arrow.png diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php index e3001cffc..f0bb211c8 100644 --- a/airtime_mvc/application/configs/ACL.php +++ b/airtime_mvc/application/configs/ACL.php @@ -25,7 +25,8 @@ $ccAcl->add(new Zend_Acl_Resource('library')) ->add(new Zend_Acl_Resource('preference')) ->add(new Zend_Acl_Resource('recorder')) ->add(new Zend_Acl_Resource('showbuilder')) - ->add(new Zend_Acl_Resource('auth')); + ->add(new Zend_Acl_Resource('auth')) + ->add(new Zend_Acl_Resource('usersettings')); /** Creating permissions */ $ccAcl->allow('G', 'index') @@ -34,11 +35,10 @@ $ccAcl->allow('G', 'index') ->allow('G', 'nowplaying') ->allow('G', 'api') ->allow('G', 'auth') - //->allow('G', 'plupload', array('upload-recorded')) ->allow('G', 'recorder') ->allow('G', 'schedule') ->allow('G', 'dashboard') - //->allow('H', 'plupload', array('plupload', 'upload', 'index')) + ->allow('H', 'usersettings') ->allow('H', 'plupload') ->allow('H', 'library') ->allow('H', 'search') diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index ebc78224b..4d2018bba 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -14,10 +14,6 @@ class PreferenceController extends Zend_Controller_Action ->addActionContext('is-import-in-progress', 'json') ->addActionContext('change-stream-setting', 'json') ->addActionContext('get-liquidsoap-status', 'json') - ->addActionContext('get-library-datatable', 'json') - ->addActionContext('set-library-datatable', 'json') - ->addActionContext('get-timeline-datatable', 'json') - ->addActionContext('set-timeline-datatable', 'json') ->initContext(); } @@ -335,40 +331,6 @@ class PreferenceController extends Zend_Controller_Action } die(json_encode($out)); } - - public function setLibraryDatatableAction() { - - $request = $this->getRequest(); - $settings = $request->getParam("settings"); - - $data = serialize($settings); - Application_Model_Preference::SetValue("library_datatable", $data, true); - } - - public function getLibraryDatatableAction() { - - $data = Application_Model_Preference::GetValue("library_datatable", true); - if ($data != "") { - $this->view->settings = unserialize($data); - } - } - - public function setTimelineDatatableAction() { - - $request = $this->getRequest(); - $settings = $request->getParam("settings"); - - $data = serialize($settings); - Application_Model_Preference::SetValue("timeline_datatable", $data, true); - } - - public function getTimelineDatatableAction() { - - $data = Application_Model_Preference::GetValue("timeline_datatable", true); - if ($data != "") { - $this->view->settings = unserialize($data); - } - } } diff --git a/airtime_mvc/application/controllers/UsersettingsController.php b/airtime_mvc/application/controllers/UsersettingsController.php new file mode 100644 index 000000000..c088bfcdd --- /dev/null +++ b/airtime_mvc/application/controllers/UsersettingsController.php @@ -0,0 +1,49 @@ +_helper->getHelper('AjaxContext'); + $ajaxContext->addActionContext('get-library-datatable', 'json') + ->addActionContext('set-library-datatable', 'json') + ->addActionContext('get-timeline-datatable', 'json') + ->addActionContext('set-timeline-datatable', 'json') + ->initContext(); + } + + public function setLibraryDatatableAction() { + + $request = $this->getRequest(); + $settings = $request->getParam("settings"); + + $data = serialize($settings); + Application_Model_Preference::SetValue("library_datatable", $data, true); + } + + public function getLibraryDatatableAction() { + + $data = Application_Model_Preference::GetValue("library_datatable", true); + if ($data != "") { + $this->view->settings = unserialize($data); + } + } + + public function setTimelineDatatableAction() { + + $request = $this->getRequest(); + $settings = $request->getParam("settings"); + + $data = serialize($settings); + Application_Model_Preference::SetValue("timeline_datatable", $data, true); + } + + public function getTimelineDatatableAction() { + + $data = Application_Model_Preference::GetValue("timeline_datatable", true); + if ($data != "") { + $this->view->settings = unserialize($data); + } + } +} \ No newline at end of file diff --git a/airtime_mvc/public/css/images/tl-arrow.png b/airtime_mvc/public/css/images/tl-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ce13702c66e693e110829b4bae73e369228001 GIT binary patch literal 1019 zcmaJ=OK1~87~WR!5n61aE%k92wo)rJ`${$;OV>8dCN|J5B@HxqF`L~ZGJ2i_roM<6914Q`E?)?`Zlw#GnM{Ok1YEKYLCC(~#*|QRP%81uN#n ziVJ5}rt<3NmO_((J!j}HTZ<2jZSSY8P8aVa8590%$jO`^F*S;{GydMvV&=?cb<#In_D zm8nJ;4}OY$6*3idqRRVVNdQ_foK&rmXGN z%R~ys`kKS?3>T!-0IKT$p_bJ|dpHO8{r*$f%P%{S%|Q<>xjMPH@<0&Eky0+yFmm$< zEi|e)T|pRm736@_j0k2;+dx&XhE`Q6YkOF;b(mFTn(!IZG^9*~6U0nX5fxG3`81zQ z#^R|=LP;lMVv>tS8e9eGOBS?ogKO+_(=E9{BUlcJtU%Yi2#t)3EKo~WGFy8YZ>d-3 z8m+ygT5?%ph7GRuuWN1`k=_ZG&88)rX4^xX^twx$`UAZ4ggl7Ftdh+8pGr|t{0WQ2 zt)l_^^qpLL{HA?)=hThf zU)`b88@s!^k*@a14uyJ1Z(Ip?;78ZHicjBdN?U88?cTw@aqUaI|7K`xwT-&{dEox7 SyZ62Y&oP^xQXY&KFaH73WkenT literal 0 HcmV?d00001 diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 9bc163de2..4d6fe4979 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -4,9 +4,23 @@ width:100px; } -#show_builder span.ui-icon-triangle-1-e { - float: left; - position: relative; - left: -20px; - top: 15px; +table tr.selected-row td, table tr.selected-row th, +table.datatable tr.selected-row td, table.datatable tr.selected-row th { + border-bottom: 2px solid #db0000 !important; } +.innerWrapper { + position:relative; + width:100%; + } +.marker { + position:absolute; + bottom:-10px; + left:-14px; + width:9px; + height:9px; + background:url(images/tl-arrow.png) no-repeat 0 0; + display:block; +} +tr.selected-row .marker { + background-position: 0 -15px; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 85627fc1d..ed2a50c20 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -256,7 +256,7 @@ $(document).ready(function() { "fnStateSave": function (oSettings, oData) { $.ajax({ - url: "/preference/set-library-datatable", + url: "/usersettings/set-library-datatable", type: "POST", data: {settings : oData, format: "json"}, dataType: "json", @@ -270,7 +270,7 @@ $(document).ready(function() { var o; $.ajax({ - url: "/preference/get-library-datatable", + url: "/usersettings/get-library-datatable", type: "GET", data: {format: "json"}, dataType: "json", diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index de6ff8327..6cecba411 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -205,7 +205,7 @@ $(document).ready(function() { if (aData.header === true) { cl = 'sb-header'; - sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; fnPrepareSeparatorRow(sSeparatorHTML, cl, 0); } else if (aData.footer === true) { @@ -226,11 +226,11 @@ $(document).ready(function() { fnPrepareSeparatorRow(sSeparatorHTML, cl, 1); } else { - //$(nRow).attr("id", "sched_"+aData.id); node = nRow.children[0]; if (aData.checkbox === true) { - node.innerHTML = ''; + var height = $(node).height(); + node.innerHTML = '
'; } else { node.innerHTML = ''; @@ -292,7 +292,7 @@ $(document).ready(function() { "fnStateSave": function (oSettings, oData) { $.ajax({ - url: "/preference/set-timeline-datatable", + url: "/usersettings/set-timeline-datatable", type: "POST", data: {settings : oData, format: "json"}, dataType: "json", @@ -306,7 +306,7 @@ $(document).ready(function() { var o; $.ajax({ - url: "/preference/get-timeline-datatable", + url: "/usersettings/get-timeline-datatable", type: "GET", data: {format: "json"}, dataType: "json",