Permalink
Browse files

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

  • Loading branch information...
2 parents 1272c17 + 8e108e8 commit ea2981574c45486074619543dec99418df94025c martin committed Aug 19, 2011
@@ -16,8 +16,9 @@ public function init()
$this->addElement('text', 'stationName', array(
'class' => 'input_text',
'label' => 'Station Name',
- 'required' => false,
+ 'required' => true,
'filters' => array('StringTrim'),
+ 'validator' => array('NotEmpty'),
'value' => Application_Model_Preference::GetValue("station_name"),
'decorators' => array(
'ViewHelper'
@@ -1,19 +1,5 @@
<fieldset class="padded">
<dl class="zend_form">
- <dt id="stationName-label" class="block-display">
- <label class="required" for="stationName"><?php echo $this->element->getElement('stationName')->getLabel() ?> :
- </label>
- </dt>
- <dd id="stationName-element" class="block-display">
- <?php echo $this->element->getElement('stationName') ?>
- <?php if($this->element->getElement('stationName')->hasErrors()) : ?>
- <ul class='errors'>
- <?php foreach($this->element->getElement('stationName')->getMessages() as $error): ?>
- <li><?php echo $error; ?></li>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- </dd>
<dd id="SupportFeedback-element" style="width:90%;">
<div class="info-text">Help Airtime improve by letting us know you are using it. This info
will be collected regularly in order to improve your user experience.</div>
@@ -47,7 +33,22 @@
</dd>
</dl>
<div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to promote your station, "Send support feedback" must be enabled</p></div>
- <dl id="public-info" style="display:none;">
+ <dl id="public-info" style="display:none;">
+ <dt id="stationName-label" class="block-display">
+ <label class="required" for="stationName"><?php echo $this->element->getElement('stationName')->getLabel() ?>
+ <span class="info-text-small">(Required)</span>:
+ </label>
+ </dt>
+ <dd id="stationName-element" class="block-display">
+ <?php echo $this->element->getElement('stationName') ?>
+ <?php if($this->element->getElement('stationName')->hasErrors()) : ?>
+ <ul class='errors'>
+ <?php foreach($this->element->getElement('stationName')->getMessages() as $error): ?>
+ <li><?php echo $error; ?></li>
+ <?php endforeach; ?>
+ </ul>
+ <?php endif; ?>
+ </dd>
<dt id="Phone-label" class="block-display">
<label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label>
<span class="info-text-small">(for verification purposes only, will not be published)</span>
@@ -1,5 +1,5 @@
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
-<h2>Support Setting</h2>
+<h2>Support Settings</h2>
<form method="post" action="/Preference/support-setting" enctype="multipart/form-data">
<div id="support-settings">
<?php echo $this->statusMsg ?>

0 comments on commit ea29815

Please sign in to comment.