Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/controllers/PreferenceController.php

@@ -114,7 +114,7 @@ class PreferenceController extends Zend_Controller_Action
     	die();
     }
     
-    public function deletesessionvarAction()
+    public function donotshowpopupAction()
     {
     	// unset session
     	Zend_Session::namespaceUnset('referrer');

airtime_mvc/application/forms/RegisterAirtime.php

@@ -17,7 +17,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
         
         // Station Name
         $stnName = new Zend_Form_Element_Text("stnName");
-        $stnName->setLabel("Station Name:(*)")
+        $stnName->setLabel("Station Name")
                 ->setRequired(true)
                 ->setValue(Application_Model_Preference::GetStationName())
                 ->setDecorators(array('ViewHelper'));

airtime_mvc/application/views/scripts/form/register-dialog.phtml

@@ -20,7 +20,7 @@
 		            <?php endif; ?>
 		        </dd>
                 <dt class="block-display info-text">
-            		Click the box below to advertise your station on <a id="link_to_whos_using" href="">Sourcefabric.org</a>. In order to promote your station, "Send support feedback" must be enabled
+            		Click the box below to advertise your station on <a id="link_to_whos_using" href="">Sourcefabric.org</a>. In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
                 </dt>
 				<dd id="publicize-element" class="block-display">
 					<label class="optional" for="Publicise">
@@ -38,7 +38,9 @@
 			</dl>
 			<dl id="public-info" style="display:none;">
 				<dt id="stnName-label">
-		            <label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?></label>
+		            <label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?>
+		            	<span class="info-text-small">(Required)</span> :
+		            </label>
 		        </dt>
 		        <dd id="stnName-element">
 		            <?php echo $this->element->getElement('stnName') ?>
@@ -55,6 +57,7 @@
 		        </dt>
 		        <dd id="Phone-element">
 		            <?php echo $this->element->getElement('Phone') ?>
+		            <span class="info-text-small">(for verification purposes only, will not be published)</span>
 		            <?php if($this->element->getElement('Phone')->hasErrors()) : ?>
 		                <ul class='errors'>
 		                    <?php foreach($this->element->getElement('Phone')->getMessages() as $error): ?>
@@ -68,6 +71,7 @@
 		        </dt>
 		        <dd id="Email-element">
 		            <?php echo $this->element->getElement('Email') ?>
+		            <span class="info-text-small">(for verification purposes only, will not be published)</span>
 		            <?php if($this->element->getElement('Email')->hasErrors()) : ?>
 		                <ul class='errors'>
 		                    <?php foreach($this->element->getElement('Email')->getMessages() as $error): ?>

airtime_mvc/public/css/add-show.css

@@ -124,5 +124,5 @@ label.wrapp-label input[type="checkbox"] {
 #add_show_duration	{
 	background: #AAAAAA;
   	cursor: default;
-  	width: 50px;
+  	width: 65px;
 }

airtime_mvc/public/css/media_library.css

@@ -46,3 +46,10 @@
 .paginationControl .ui-button-text-only .ui-button-text {
     padding: 0.2em 1em;
 }
+#library_display td {
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+}

airtime_mvc/public/css/styles.css

@@ -1861,7 +1861,7 @@ fieldset.closed, fieldset.display_field.closed {
 }
 
 fieldset.closed dl, fieldset.closed textarea, fieldset.closed div {
-    display:none;
+	display:none;
 }
 
 fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
@@ -1870,7 +1870,7 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
 }
 
 input[type="checkbox"][disabled] {
-    opacity: 0.6;
+	opacity: 0.6;
 }
 
 .play_small {
@@ -1896,3 +1896,17 @@ input[type="checkbox"][disabled] {
 .play_small.playing:hover {
 	background-position: -20px -11px;
 }
+
+.info-text-small {
+    color: #5B5B5B;
+    font-size: 11px;
+    line-height: 150%;
+    margin: 0;
+    padding: 0 0 6px;
+	font-style:italic;
+	font-weight:normal;
+}
+dd .info-text-small {
+    padding: 1px 0 2px;
+	display:inline-block;
+}

airtime_mvc/public/js/airtime/nowplaying/register.js

@@ -1,8 +1,8 @@
 $(document).ready(function(){
 	var dialogGlob;
 	
-	function deleteSessionVar(){
+	function doNotShowPopup(){
-		$.get("/Preference/deletesessionvar");
+		$.get("/Preference/donotshowpopup");
 	}
 	
     $.get("/Preference/register", {format:"json"}, function(json){
@@ -15,7 +15,7 @@ $(document).ready(function(){
             resizable: false,
             modal: true,
             position:['center',50],
-            close: deleteSessionVar,
+            close: doNotShowPopup,
             buttons: [
                 {
                 	id: "remind_me",