Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
This commit is contained in:
commit
b1c00932c6
|
@ -99,7 +99,7 @@ class Config {
|
|||
public static function setAirtimeVersion() {
|
||||
$airtime_version = Application_Model_Preference::GetAirtimeVersion();
|
||||
$uniqueid = Application_Model_Preference::GetUniqueId();
|
||||
$buildVersion = @file_get_contents(self::$rootDir."/../VERSION");
|
||||
$buildVersion = "2.5.2"; // @file_get_contents(self::$rootDir."/../VERSION");
|
||||
self::$CC_CONFIG['airtime_version'] = md5($airtime_version.$buildVersion);
|
||||
}
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
|
||||
<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
|
||||
<div id="Panel">
|
||||
<div class="logo"></div>
|
||||
<?php echo $this->versionNotify();
|
||||
$sss = $this->SourceSwitchStatus();
|
||||
$scs = $this->SourceConnectionStatus();
|
||||
|
@ -30,17 +29,21 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
"scheduled_play_switch"=>$sss['scheduled_play'])) ?>
|
||||
<?php $partial = array('menu.phtml', 'default');
|
||||
$this->navigation()->menu()->setPartial($partial); ?>
|
||||
<div class="personal-block solo">
|
||||
<ul>
|
||||
<li>
|
||||
<!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span> -->
|
||||
<a id="current-user" href=<?php echo $baseUrl . "User/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
|
||||
| <a href=<?php echo $baseUrl . "Login/logout"?>><?php echo _("Logout")?></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="nav">
|
||||
<div class="logo"></div>
|
||||
<div class="personal-block solo">
|
||||
<ol>
|
||||
<li>
|
||||
<!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span> -->
|
||||
<a id="current-user" href=<?php echo $baseUrl . "User/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
|
||||
| <a href=<?php echo $baseUrl . "Login/logout"?>><?php echo _("Logout")?></a>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
|
||||
<?php echo $this->navigation()->menu() ?>
|
||||
<?php echo $this->navigation()->menu() ?>
|
||||
<div style="clear:both;"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wrapper" id="content"><?php echo $this->layout()->content ?></div>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<ul id="nav">
|
||||
<ol id="navlist">
|
||||
<?php foreach ($this->container as $page) : ?>
|
||||
<?php if($this->navigation()->accept($page)) : ?>
|
||||
<li class="top <?php if($page->isActive(true)){echo 'active';} ?>">
|
||||
|
@ -29,4 +29,4 @@
|
|||
</li>
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</ol>
|
||||
|
|
|
@ -300,13 +300,12 @@
|
|||
|
||||
|
||||
.personal-block.solo {
|
||||
position: absolute;
|
||||
right: 145px;
|
||||
top: 104px;
|
||||
width: auto;
|
||||
z-index: 1000;
|
||||
height:auto;
|
||||
margin:0;
|
||||
width: auto;
|
||||
height:auto;
|
||||
margin: 0 10px 0 0;
|
||||
}
|
||||
.personal-block.solo ol {
|
||||
margin-top: 6px;
|
||||
}
|
||||
.time-info-block.pull-right {
|
||||
margin-right:0;
|
||||
|
|
|
@ -48,14 +48,12 @@ select {
|
|||
}
|
||||
|
||||
.logo {
|
||||
position:absolute;
|
||||
right:20px;
|
||||
top:104px;
|
||||
background:transparent url(images/airtime_logo.png) no-repeat 0 0;
|
||||
height:35px;
|
||||
width:66px;
|
||||
z-index:1000;
|
||||
display:block;
|
||||
background: transparent url(images/airtime_logo.png) no-repeat 0 0;
|
||||
height: 35px;
|
||||
width: 66px;
|
||||
float: right;
|
||||
padding: 0 5px 0 10px;
|
||||
margin-top: -5px;
|
||||
}
|
||||
|
||||
/* Version Notification Starts*/
|
||||
|
@ -286,9 +284,68 @@ select {
|
|||
background:url(images/masterpanel_spacer.png) no-repeat right 0;
|
||||
}
|
||||
.time-info-block {
|
||||
padding:0 14px 0 2px;
|
||||
min-width:105px;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
#navlist {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
#nav li.top {
|
||||
float: none;
|
||||
}
|
||||
@media screen and (max-width: 1200px) {
|
||||
.now-playing-block {
|
||||
width: 30%;
|
||||
}
|
||||
.show-block {
|
||||
width: 25%;
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: 920px) {
|
||||
.now-playing-block {
|
||||
width: 50%;
|
||||
}
|
||||
.show-block {
|
||||
display: none;
|
||||
}
|
||||
.personal-block.solo {
|
||||
right: 10px !important;
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: 810px) {
|
||||
.now-playing-block {
|
||||
width: 40%;
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: 863px) {
|
||||
#nav {
|
||||
height: inherit;
|
||||
overflow-y: visible;
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: 680px) {
|
||||
.now-playing-block {
|
||||
display: none;
|
||||
}
|
||||
#nav li.top {
|
||||
display: -webkit-flex;
|
||||
width: 110px;
|
||||
}
|
||||
.personal-block.solo {
|
||||
float: none;
|
||||
text-align: left;
|
||||
}
|
||||
.personal-block.solo ol {
|
||||
padding-left: 12px;
|
||||
}
|
||||
.logo {
|
||||
float: none;
|
||||
margin-left: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.time-info-block ul {
|
||||
margin:0;
|
||||
padding:6px 0 0;
|
||||
|
|
Loading…
Reference in New Issue