Merge branch 'master' of git://github.com/colosa/processmaker

This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-02-12 16:07:49 -04:00
3 changed files with 17 additions and 4 deletions

View File

@@ -117,6 +117,14 @@ class Home extends Controller
}
}
$oServerConf = & serverConf::getSingleton();
if ($oServerConf->isRtl( SYS_LANG )) {
$swRtl = 1;
} else {
$swRtl = 0;
}
//Get simplified options
global $G_TMP_MENU;
@@ -149,6 +157,7 @@ class Home extends Controller
$this->setVar( 'switchLink', $switchLink );
$this->setVar( 'arrayMnuOption', $arrayMnuOption );
$this->setVar( 'mnuNewCase', $mnuNewCase );
$this->setVar( 'rtl', $swRtl );
$this->render();
}
@@ -209,7 +218,6 @@ class Home extends Controller
$title = G::LoadTranslation("ID_UNASSIGNED_INBOX");
break;
default:
G::pr('sueñooooo');die();
$title = ucwords( $httpData->t );
break;
}

View File

@@ -525,6 +525,9 @@ div.topbar ul.primary-nav li ul {
div.topbar ul.secondary-nav li ul {
right: 0;
}
div.topbar ul.rtl-secondary-nav li ul {
left: 0;
}
div.topbar ul li ul li {
float: none;
clear: both;

View File

@@ -136,14 +136,16 @@
</li>
{/if}
</ul>
<ul class="nav secondary-nav">
{if $rtl eq 1}
<ul class="nav rtl-secondary-nav">
{else}
<ul class="nav secondary-nav">
{/if}
<li class="account">
<a class="menu user-photo" href="javascript:;">
<img alt="user_avatar_mini" height="24" src="users/users_ViewPhotoGrid?pUID={$usrUid}" width="24" />
<span class="menu-label screen-name">{$userName}</span>
</a>
<ul class="menu-dropdown">
<!--<li><a href="#" accesskey="s" id="settings_link">Settings</a></li>
<li><a href="#" accesskey="?" id="help_link">Help</a></li>-->