From 9200484d970a1a223e2767fe8593c4840f3ba72a Mon Sep 17 00:00:00 2001 From: lukabazuka Date: Thu, 24 Mar 2011 23:49:11 +0100 Subject: [PATCH 1/5] fixed issues CC-2102, CC-2062 and CC-2083 --- public/css/images/icon_rebroadcast.png | Bin 1075 -> 2876 bytes public/css/images/icon_rebroadcast_m.png | Bin 0 -> 1182 bytes public/css/images/icon_record.png | Bin 1080 -> 990 bytes public/css/images/icon_record_m.png | Bin 0 -> 1226 bytes public/css/styles.css | 17 ++++++++++++++++- 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 public/css/images/icon_rebroadcast_m.png create mode 100644 public/css/images/icon_record_m.png diff --git a/public/css/images/icon_rebroadcast.png b/public/css/images/icon_rebroadcast.png index 5282d87b2aba3ae5ae60e122f5d1b77c4c42cb27..3a6c195713b145e70b7517f348e0dfd38cc3209d 100644 GIT binary patch literal 2876 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 diff --git a/public/css/images/icon_rebroadcast_m.png b/public/css/images/icon_rebroadcast_m.png new file mode 100644 index 0000000000000000000000000000000000000000..585a7d31fee08f0bea53b231b886c01536d5b9d8 GIT binary patch literal 1182 zcmbVMOHABG81@1Ug>0nl0i-lV898b%$=V(-Yh#OrWo=Vd$r7||npI91djJ>gaqOYH zpgbt*AvvTXs;bf+njWHxN>vp&RF!f_6``nzHjhgpC5I{!mquxlHkTYCkuk8e2b4;+ zWP4`(f8X~%eSV<-{XNZZH!}>gC*P+R>3c7|<8SVw&oBONJscenqf7?z2&tF>VtQ;m zj6mKsM^O=(_SDH0)X6aQwo@vTa^Z+-VV5%_8?Ng56wNT5-BsVT#t{L-Xw>mC?9;2) zSm4+h_ISD=6nqVhIepUs8l3JgS<~Z|Vzb>{ptGt{0v8bzRNVl{_Y+Wo>3+xfK zsP}GZ(OrfeBg9vEzEY`hl@y1AQ64Ia5^;!Pl3FCgDUX=dq!%8jG3Y3?0>>u~_CUmF z4&zCZVX3E^A-H~_uubfRTZy76)@F+B^_bRDX@g_T~5 zRkZ+_1P3LICu$uqFop>Z$FL8y!8ADTcs8ztQE@h7)luMlgzVk`yI>=`sV(UjiK>pi9F{b4)%#*f*@ z&C5&K?^kCUU#_qJK7aAzUx&VWhQOKl^3{)D2uJ4L%J;M+8et-qZJkM5CuZY!V<-15 zW#frUv4;x_3lG*8nfaGz>zK>?zis`HtKXeC$Sl5duDB-F{ zwAz*X?by&KH?;1r{rBGOzp~OI#+nMdL}u~R*q67KvyIHsntI{SpKdl3?tQa%Bhl7& zy0P`UwYs@8b4uUJ3wS3#U!F-eefIg@^9|2_{iV-aoUI>9e!$elndg_T7Y}!Vw&;(M MH~RG-aznGP0EuLOtpET3 literal 0 HcmV?d00001 diff --git a/public/css/images/icon_record.png b/public/css/images/icon_record.png index ffedeb5c12ed33368016ea3f435956de0fc28332..020ebe283a8b503b745a5a4b18e199147717040f 100644 GIT binary patch delta 347 zcmdnNagSZGGr-TCmrII^fq{Y7)59eQNQ(e57Y7@V+!9*%Y@(tDqryfnb;ike7?mbx zF=kKR#iTvCnn_y0#M0H+)zZz#)XdD>(9qSu$;r{c!qwH;($vt%!pX&OvK^BQOp!58 zMNgOvVxT4&;8LWdP+Ss}nr4-fpIn-onpfiKVyjet(N-X9GeCUz0B*6A&fNtXSO`DAwSR@#DrcC9XRuEMUG@rrK L)z4*}Q$iB}I^JaZ delta 438 zcmcb|zJo)tGr-TCmrII^fq{Y7)59eQNQ(k77Y7@VjGiufW1^x4W6DM^b;ilF7*i%^ zF>2Nq`1)G;7iFer<|XF1awEb=G}kiT$P3}`EZC%dbk%Q~loCIAaMiEaP@ diff --git a/public/css/images/icon_record_m.png b/public/css/images/icon_record_m.png new file mode 100644 index 0000000000000000000000000000000000000000..50b3ebe152f1075f6f3005348994f3bed0270665 GIT binary patch literal 1226 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W;!3HFgc;@~FQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?@KsLn2Bde0{8v^Ko2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdpzyaD(%Tp#cR9GX09g0)0b01O41wkiWpHi%Wu15zfG>x;Uh=AXPso zwK%`DC>aHCFybnZQU%%yG$2F3nBNEAe!(RRYTBrDUd9nVVRe zJG&Y>nVFcHxf&Q6S{fNSyE+*fS{RwRIGPz5!_2^{*T}-s)Y#C?)XdD>(9qSu$=uA+ z$;s8l%miqnk+A_xuV-FyNn&1dD$L$Yki8JSu6XrYITxiSmgEMq}yTBYn2n_qr;#aCUpJo9!M z>w?Q6rQ*Bt*yde7oDguOG4acXiUcv&?VD!)X=~qOk=kxwK~o5 zLPVaShVM>D!%trGdX8V-4=kVN_FCOBJE@nwDQ>me>$Ufpco?$yLYK^5n|KFQx_G+! KxvX Date: Thu, 24 Mar 2011 21:02:08 -0400 Subject: [PATCH 2/5] -fixed some problems with recorder not working on ubuntu 10.10 --- .../show-recorder/install/recorder-daemontools.sh | 5 ++++- python_apps/show-recorder/testrecordscript.py | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/python_apps/show-recorder/install/recorder-daemontools.sh b/python_apps/show-recorder/install/recorder-daemontools.sh index d9cec7146..3056803d5 100644 --- a/python_apps/show-recorder/install/recorder-daemontools.sh +++ b/python_apps/show-recorder/install/recorder-daemontools.sh @@ -1,12 +1,15 @@ #!/bin/sh recorder_user="pypo" export HOME="/home/pypo/" +export TERM=xterm # Location of pypo_cli.py Python script recorder_path="/opt/recorder/bin/" recorder_script="testrecordscript.py" echo "*** Daemontools: starting daemon" +echo $PATH +echo $TERM cd ${recorder_path} exec 2>&1 # Note the -u when calling python! we need it to get unbuffered binary stdout and stderr -exec sudo python -u ${recorder_path}${recorder_script} -f +python -u ${recorder_path}${recorder_script} # EOF diff --git a/python_apps/show-recorder/testrecordscript.py b/python_apps/show-recorder/testrecordscript.py index 4c659cdcb..7e1673d73 100644 --- a/python_apps/show-recorder/testrecordscript.py +++ b/python_apps/show-recorder/testrecordscript.py @@ -12,7 +12,8 @@ from poster.encode import multipart_encode from poster.streaminghttp import register_openers import urllib2 -from subprocess import call +#from subprocess import call +from subprocess import Popen, PIPE from threading import Thread # loading config file @@ -39,8 +40,10 @@ class Recorder(Thread): filename = self.filename.replace(" ", "-") filepath = "%s%s.%s" % (config["base_recorded_files"], filename, self.filetype) - command = "ecasound -i alsa -o %s -t:%s" % (filepath, length) - call(command, shell=True) + command = ("ecasound -i alsa -o %s -t:%s" % (filepath, length)).split(' ') + print(command) + Popen(command, stdout=PIPE) + #call(command, shell=False) return filepath From 0cab539f8a4ec71f69a14058040ecc00eb043a14 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 24 Mar 2011 21:36:14 -0400 Subject: [PATCH 3/5] -No ticket: Fixed recording light on, even after record show ended. --- public/js/playlist/playlist.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 98b227381..a72e94dc2 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -165,11 +165,12 @@ function updatePlaybar(){ /* Column 1 update */ $('#playlist').text("Current Show:"); + var recElem = $('.recording-show'); if (currentShow.length > 0){ $('#playlist').text(currentShow[0].name); - - var recElem = $('.recording-show'); (currentShow[0].record == "1") ? recElem.show(): recElem.hide(); + } else { + recElem.hide(); } $('#show-length').empty(); From d71bfbe1919e4352244262672ce278b97b50c205 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 24 Mar 2011 22:07:04 -0400 Subject: [PATCH 4/5] CC-2108: Show time is hardcoded to 00:00 -fixed --- application/views/scripts/partialviews/header.phtml | 2 +- public/css/styles.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/scripts/partialviews/header.phtml b/application/views/scripts/partialviews/header.phtml index a817fc1fd..f1de80cc9 100644 --- a/application/views/scripts/partialviews/header.phtml +++ b/application/views/scripts/partialviews/header.phtml @@ -14,7 +14,7 @@
- 00:00 +
diff --git a/public/css/styles.css b/public/css/styles.css index 6f77239ca..3b19a442a 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -184,7 +184,7 @@ select { .progressbar .progress-show-error { background:#d40000 url(images/progressbar_show_error.png) repeat-x 0 0; } -.now-playing-info .lenght { +.now-playing-info .show-length { color:#c4c4c4; padding-left:6px; } @@ -1505,4 +1505,4 @@ ul.errors li { .medium-icon.rebroadcast { background:url(images/icon_rebroadcast_m.png) no-repeat 0 0; } - \ No newline at end of file + From 343fb593eedcf1707c29c427f66cccf936207f66 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 24 Mar 2011 22:29:14 -0400 Subject: [PATCH 5/5] CC-2051: Unable to change user password -Password is changeable, and success message appears whenever a user is added/updated. --- application/controllers/UserController.php | 8 ++++++++ application/forms/AddUser.php | 6 +++--- application/views/scripts/user/add-user.phtml | 1 + public/css/styles.css | 10 ++++++++++ public/js/airtime/user/user.js | 1 + 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index 72b6a20ef..081c32b70 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -23,6 +23,8 @@ class UserController extends Zend_Controller_Action $this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript'); $request = $this->getRequest(); $form = new Application_Form_AddUser(); + + $this->view->successMessage = ""; if ($request->isPost()) { if ($form->isValid($request->getPost())) { @@ -42,6 +44,12 @@ class UserController extends Zend_Controller_Action $user->save(); $form->reset(); + + if (strlen($formdata['user_id']) == 0){ + $this->view->successMessage = "
User added successfully!
"; + } else { + $this->view->successMessage = "
User updated successfully!
"; + } } } } diff --git a/application/forms/AddUser.php b/application/forms/AddUser.php index d1eca586b..58bc91543 100644 --- a/application/forms/AddUser.php +++ b/application/forms/AddUser.php @@ -72,9 +72,9 @@ class Application_Form_AddUser extends Zend_Form $select->setAttrib('class', 'input_select'); $select->setAttrib('style', 'width: 40%'); $select->setMultiOptions(array( - "G" => "guest", - "H" => "host", - "A" => "admin" + "G" => "Guest", + "H" => "Host", + "A" => "Admin" )); $select->setRequired(true); $this->addElement($select); diff --git a/application/views/scripts/user/add-user.phtml b/application/views/scripts/user/add-user.phtml index b37c032bc..db1e76138 100644 --- a/application/views/scripts/user/add-user.phtml +++ b/application/views/scripts/user/add-user.phtml @@ -26,6 +26,7 @@
+ successMessage ?>
form ?>
diff --git a/public/css/styles.css b/public/css/styles.css index 3b19a442a..7d0dc8690 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -1219,6 +1219,16 @@ ul.errors li { margin-bottom:2px; border:1px solid #c83f3f; } + +div.success{ + color:#3B5323; + font-size:11px; + padding:2px 4px; + background:#93DB70; + margin-bottom:2px; + border:1px solid #488214; +} + .collapsible-header { border: 1px solid #8f8f8f; background-color: #cccccc; diff --git a/public/js/airtime/user/user.js b/public/js/airtime/user/user.js index 4add2d4b1..6a518fdc1 100644 --- a/public/js/airtime/user/user.js +++ b/public/js/airtime/user/user.js @@ -2,6 +2,7 @@ function populateForm(entries){ //$('#user_details').show(); $('.errors').remove(); + $('.success').remove(); $('#user_id').val(entries.id); $('#login').val(entries.login);