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

Merge branch 'saas' of github.com:sourcefabric/Airtime into saas

This commit is contained in:
Albert Santoni 2015-03-25 17:34:59 -04:00
parent 58624ec100 040eb1443d
commit b1c00932c6
5 changed files with 90 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/configs/conf.php
View File

@ -99,7 +99,7 @@ class Config {
public static function setAirtimeVersion() { public static function setAirtimeVersion() {
$airtime_version = Application_Model_Preference::GetAirtimeVersion(); $airtime_version = Application_Model_Preference::GetAirtimeVersion();
$uniqueid = Application_Model_Preference::GetUniqueId(); $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); self::$CC_CONFIG['airtime_version'] = md5($airtime_version.$buildVersion);
} }

25
airtime_mvc/application/layouts/scripts/layout.phtml
View File

@ -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())) ?> <?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
<div id="Panel"> <div id="Panel">
<div class="logo"></div>
<?php echo $this->versionNotify(); <?php echo $this->versionNotify();
$sss = $this->SourceSwitchStatus(); $sss = $this->SourceSwitchStatus();
$scs = $this->SourceConnectionStatus(); $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'])) ?> "scheduled_play_switch"=>$sss['scheduled_play'])) ?>
<?php $partial = array('menu.phtml', 'default'); <?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?> $this->navigation()->menu()->setPartial($partial); ?>
<div class="personal-block solo"> <div id="nav">
<ul> <div class="logo"></div>
<li> <div class="personal-block solo">
<!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span>&nbsp;--> <ol>
<a id="current-user" href=<?php echo $baseUrl . "User/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a> <li>
| <a href=<?php echo $baseUrl . "Login/logout"?>><?php echo _("Logout")?></a> <!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span>&nbsp;-->
</li> <a id="current-user" href=<?php echo $baseUrl . "User/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
</ul> | <a href=<?php echo $baseUrl . "Login/logout"?>><?php echo _("Logout")?></a>
</div> </li>
</ol>
</div>
<?php echo $this->navigation()->menu() ?> <?php echo $this->navigation()->menu() ?>
<div style="clear:both;"></div>
</div>
</div> </div>
<div class="wrapper" id="content"><?php echo $this->layout()->content ?></div> <div class="wrapper" id="content"><?php echo $this->layout()->content ?></div>

4
airtime_mvc/application/views/scripts/menu.phtml
View File

@ -1,4 +1,4 @@
<ul id="nav"> <ol id="navlist">
<?php foreach ($this->container as $page) : ?> <?php foreach ($this->container as $page) : ?>
<?php if($this->navigation()->accept($page)) : ?> <?php if($this->navigation()->accept($page)) : ?>
<li class="top <?php if($page->isActive(true)){echo 'active';} ?>"> <li class="top <?php if($page->isActive(true)){echo 'active';} ?>">
@ -29,4 +29,4 @@
</li> </li>
<?php endif; ?> <?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ol>

13
airtime_mvc/public/css/masterpanel.css
View File

@ -300,13 +300,12 @@
.personal-block.solo { .personal-block.solo {
position: absolute; width: auto;
right: 145px; height:auto;
top: 104px; margin: 0 10px 0 0;
width: auto; }
z-index: 1000; .personal-block.solo ol {
height:auto; margin-top: 6px;
margin:0;
} }
.time-info-block.pull-right { .time-info-block.pull-right {
margin-right:0; margin-right:0;

77
airtime_mvc/public/css/styles.css
View File

@ -48,14 +48,12 @@ select {
} }
.logo { .logo {
position:absolute; background: transparent url(images/airtime_logo.png) no-repeat 0 0;
right:20px; height: 35px;
top:104px; width: 66px;
background:transparent url(images/airtime_logo.png) no-repeat 0 0; float: right;
height:35px; padding: 0 5px 0 10px;
width:66px; margin-top: -5px;
z-index:1000;
display:block;
} }
/* Version Notification Starts*/ /* Version Notification Starts*/
@ -286,9 +284,68 @@ select {
background:url(images/masterpanel_spacer.png) no-repeat right 0; background:url(images/masterpanel_spacer.png) no-repeat right 0;
} }
.time-info-block { .time-info-block {
padding:0 14px 0 2px; position: absolute;
min-width:105px; 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 { .time-info-block ul {
margin:0; margin:0;
padding:6px 0 0; padding:6px 0 0;