fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 0000 "update for new main UI uxmodern to show the enterprise message"

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2012-05-10 18:28:25 -04:00
parent c4af5f8d23
commit 7fdf9ad063
3 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/controllers/main.php
View File

@@ -41,6 +41,15 @@ class Main extends Controller
$this->setVar('user_avatar', 'users/users_ViewPhotoGrid?pUID=' . $_SESSION['USER_LOGGED'].'&h=' . rand()); $this->setVar('user_avatar', 'users/users_ViewPhotoGrid?pUID=' . $_SESSION['USER_LOGGED'].'&h=' . rand());
$this->setVar('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG)); $this->setVar('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
// license notification
$expireInLabel = '';
if (class_exists('pmLicenseManager')) {
$pmLicenseManager = &pmLicenseManager::getSingleton();
$expireIn = $pmLicenseManager->getExpireIn();
$expireInLabel = $pmLicenseManager->getExpireInLabel();
}
$this->setVar('licenseNotification', $expireInLabel);
// setting variables on javascript env. // setting variables on javascript env.
$this->setJSVar('meta', array('menu'=>$this->getMenu())); $this->setJSVar('meta', array('menu'=>$this->getMenu()));

23
workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css
View File

@@ -85,13 +85,12 @@
a.options-tool{ a.options-tool{
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: normal;
} }
a.options-tool:hover { a.options-tool:hover {
color: #fff; color: #fff;
text-decoration: underline; text-decoration: underline;
font-weight: bold;
} }
a.options-tool:focus { a.options-tool:focus {
@@ -1557,3 +1556,23 @@ td.x-cnotes-label {
padding-right: 3px; padding-right: 3px;
} }
.x-pm-license-notification {
background-color: #a7bec5;
background-image: -moz-linear-gradient(#fff, #a7bec5);
background: -webkit-linear-gradient(#fff,#a7bec5);
font: 8pt Tahoma,sans-serif,MiscFixed;
color:#fff;
text-align: center;
height:20px;
padding: 3px 10px 3px 10px;
border-radius: 4px 4px 4px 4px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.x-pm-license-notification a {
font: 8pt Tahoma,sans-serif,MiscFixed;
color: #fff;
text-decoration: none;
}

15
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -22,15 +22,20 @@
<div id="header-content" style="display:none"> <div id="header-content" style="display:none">
<table class="x-pm-headerbar"> <table class="x-pm-headerbar">
<tr> <tr>
<td width="33%" valign="middle"> <td width="50%" valign="middle">
<img src="{$logo_company}" width="180" height="24"/> <img src="{$logo_company}" width="180" height="24"/>
</td> </td>
<td align="center"></td>
<td width="33%" align="right" valign="top"> <td align="right" valign="top">
<table width="100%" height="25" border="0" cellspacing="0" cellpadding="0" class="headerRightSection"> <table width="100%" height="25" border="0" cellspacing="0" cellpadding="0" class="headerRightSection">
<tr valign="middle"> <tr valign="middle">
<td align="right">
{if $licenseNotification != ''}
<span class="x-pm-license-notification">
<img src="/images/alert_icon.gif" width="10px" headerRightSection="10px"/> {$licenseNotification}
</span>
{/if}
</td>
<td height="12" valign="middle" align="right" valign="top"> <td height="12" valign="middle" align="right" valign="top">
<a href="#" id="options-tool" class="options-tool"> <a href="#" id="options-tool" class="options-tool">
{$userfullname}<br /> {$userfullname}<br />