Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SAAS-289: Remove all isSaaS checks

Browse source 
-done
This commit is contained in:
Martin Konecny 2012-11-06 17:10:47 -05:00
parent 90f14584b5
commit fd3305bc4c
15 changed files with 15 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/views/scripts/form/preferences.phtml
View file

@ -2,12 +2,10 @@
<?php echo $this->element->getSubform('preferences_general') ?>
<?php if (!$this->isSaas) { ?>
<h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span>Email / Mail Server Settings</h3>
<div class="collapsible-content" id="email-server-settings">
<?php echo $this->element->getSubform('preferences_email_server') ?>
</div>
<?php } ?>
<h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span>Email / Mail Server Settings</h3>
<div class="collapsible-content" id="email-server-settings">
<?php echo $this->element->getSubform('preferences_email_server') ?>
</div>
<h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span>SoundCloud Settings</h3>

2
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
View file

@ -1,7 +1,6 @@
<fieldset class="padded">
<dl class="zend_form">
<!-- Enable System Email option -->
<?php if( !$this->isSaas ){?>
<dd id="enableSystemEmail-element" class="block-display">
<label class="required" for="timezone">
@ -103,6 +102,5 @@
</dd>
<?php } ?>
</dl>
</fieldset>

8
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View file

@ -76,7 +76,6 @@
</ul>
<?php endif; ?>
</dd>
<?php if( !$this->isSaas ){?>
<dt id="master_harbor_input_port-label">
<label class="optional" for="master_harbor_input_port"><?php echo $this->element->getElement('master_harbor_input_port')->getLabel() ?> :
</label>
@ -105,14 +104,13 @@
</ul>
<?php endif; ?>
</dd>
<?php } ?>
<dt id="master_dj_connection_url-label">
<label class="optional" for="master_dj_connection_url" style="white-space: nowrap">Master Source Connection URL:
</label>
</dt>
<dd id="master_dj_connection_url-element">
<span id="stream_url"><?php echo $this->element->getElement('master_dj_connection_url')->setValue($this->master_dj_connection_url) ?></span>
<?php if( !$this->isSaas && !$this->isDemo){?>
<?php if(!$this->isDemo){?>
<a href=# id="connection_url_override" style="font-size: 12px;">Override</a>&nbsp;&nbsp;
<span class="override_help_icon">
</span><br>
@ -121,7 +119,6 @@
<a href=# id="ok" style="font-size: 12px;">OK</a> <a href=# id="reset" style="font-size: 12px;">RESET</a>
</div>
</dd>
<?php if( !$this->isSaas ){?>
<dt id="dj_harbor_input_port-label">
<label class="optional" for="dj_harbor_input_port"><?php echo $this->element->getElement('dj_harbor_input_port')->getLabel() ?> :
</label>
@ -150,14 +147,13 @@
</ul>
<?php endif; ?>
</dd>
<?php } ?>
<dt id="live_dj_connection_url-label">
<label class="optional" for="live_dj_connection_url" style="white-space: nowrap">Show Source Connection URL:
</label>
</dt>
<dd id="live_dj_connection_url-element">
<span id="stream_url"><?php echo $this->element->getElement('live_dj_connection_url')->setValue($this->live_dj_connection_url) ?></span>
<?php if( !$this->isSaas && !$this->isDemo ){?>
<?php if( !$this->isDemo ){?>
<a href=# id="connection_url_override" style="font-size: 12px;">Override</a>&nbsp;&nbsp;
<span class="override_help_icon">
</span><br>

6
airtime_mvc/application/views/scripts/form/support-setting.phtml
View file

@ -1,5 +1,4 @@
<fieldset class="padded">
<?php if( !$this->isSaas ){?>
<dl class="zend_form">
<dd id="SupportFeedback-element" style="width:90%;">
<div class="info-text">
@ -38,8 +37,7 @@
</dd>
</dl>
<div class="info-text" style="clear: both;padding: 4px 0 4px 15px;">(In order to promote your station, "Send support feedback" must be enabled).<br /><br /></div>
<?php }?>
<dl id="public-info" style="display:<?php echo !$this->isSaas?"none":"block"?>;">
<dl id="public-info" style="display:<?php echo "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>:
@ -154,7 +152,6 @@
<?php endif; ?>
</dd>
</dl>
<?php if( !$this->isSaas ){?>
<div id="show_what_sending" style="display: block;">
<fieldset class="display_field toggle closed">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend>
@ -182,5 +179,4 @@
<a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Sourcefabric Privacy Policy</a>
<?php }?>
</div>
<?php } ?>
</fieldset>

11
airtime_mvc/application/views/scripts/menu.phtml
View file

@ -1,9 +1,3 @@
<?php
$isSaas = true;
if(Application_Model_Preference::GetPlanLevel() == "disabled"){
$isSaas = false;
}
?>
<ul id="nav">
<?php foreach ($this->container as $page) : ?>
<?php if($this->navigation()->accept($page)) : ?>
@ -13,10 +7,7 @@
<span class="down"><?php echo $page->getLabel(); ?></span>
</a>
<ul class="sub">
<?php foreach ($page->getPages() as $sub) :
if($isSaas && $sub->getId() == "manage_folder"){
continue;
} ?>
<?php foreach ($page->getPages() as $sub) : ?>
<li>
<a href="<?php echo $sub->getHref(); ?>" <?php echo ($sub->getTarget() != "")?"target=\"".$sub->getTarget()."\"":""; ?>><?php echo $sub->getLabel(); ?></a>
</li>

2
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -20,14 +20,12 @@
<div id="live-stream-override" class="collapsible-content">
<?php echo $this->live; ?>
</div>
<?php if(!$this->isSaas()){?>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Record & Rebroadcast</h3>
<div id="schedule-record-rebroadcast" class="collapsible-content">
<?php echo $this->rr; ?>
<?php echo $this->absoluteRebroadcast; ?>
<?php echo $this->rebroadcast; ?>
</div>
<?php }?>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
<div id="schedule-show-who" class="collapsible-content">
<?php echo $this->who; ?>