mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-16 13:03:16 +01:00
Some Fixes for mobile theme:
- Fix missing change password on top_menu - Change category icon - Make the sidebox size bigger - Show print button on top_menu
This commit is contained in:
Hadi Nategh
commit
6f5b5d8e7d
@ -460,7 +460,7 @@ div .egw_fw_ui_sidemenu_entry_content > div {
|
||||
$id = $app_data['id'] ? $app_data['id'] : ($app_data['name'] ? $app_data['name'] : $app_data['title']);
|
||||
$title = html::$ua_mobile || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'mobile'
|
||||
? '' : htmlspecialchars($alt_label ? $alt_label : $app_data['title']);
|
||||
$this->topmenu_items[] = '<a id="topmenu_' . $id . '" href="'.htmlspecialchars($app_data['url']).'">'.$title.'</a>';
|
||||
$this->topmenu_items[] = '<a id="topmenu_' . $id . '" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -283,6 +283,9 @@
|
||||
// Stores opened popups object
|
||||
this.popups = [];
|
||||
|
||||
// The size that sidebox should be opened with
|
||||
this.sideboxSize = _sideboxStartSize;
|
||||
|
||||
//Bind handler to orientation change
|
||||
$j(window).on("orientationchange",function(){
|
||||
self.orientation();
|
||||
@ -359,7 +362,7 @@
|
||||
if (orientation === 'landscape')
|
||||
{
|
||||
$toolbar.css('height','auto');
|
||||
this.toggleMenuResizeHandler(this.getToggleMenuState() === "off"?72:280);
|
||||
this.toggleMenuResizeHandler(this.getToggleMenuState() === "off"?72:this.sideboxSize);
|
||||
$tabs.appendTo('#egw_fw_sidemenu');
|
||||
// Remove tabs header portriat's specific styles
|
||||
$tabs.removeClass('tabs-header-portrait-collapsed');
|
||||
@ -368,7 +371,7 @@
|
||||
{
|
||||
$toolbar.css('height','60px');
|
||||
$tabs.appendTo($toolbar);
|
||||
this.toggleMenuResizeHandler(this.getToggleMenuState() === "off"?1:280);
|
||||
this.toggleMenuResizeHandler(this.getToggleMenuState() === "off"?1:this.sideboxSize);
|
||||
if (this.getToggleMenuState() === "off")
|
||||
{
|
||||
$tabs.addClass('tabs-header-portrait-collapsed');
|
||||
@ -415,7 +418,7 @@
|
||||
{
|
||||
var state = _state || this.getToggleMenuState();
|
||||
var collapseSize = this.isLandscape()?72:1;
|
||||
var expandSize = 280;
|
||||
var expandSize = this.sideboxSize;
|
||||
var $toggleMenu = $j(this.baseContainer);
|
||||
var $tabs = $j('.egw_fw_ui_tabs_header');
|
||||
if (state === 'on')
|
||||
@ -492,7 +495,7 @@
|
||||
else
|
||||
{
|
||||
$toggleMenu.removeClass('sidebar-toggle');
|
||||
this.toggleMenuResizeHandler(280);
|
||||
this.toggleMenuResizeHandler(this.sideboxSize);
|
||||
}
|
||||
},
|
||||
|
||||
@ -575,7 +578,7 @@
|
||||
|
||||
toggleMenuResizeHandler:function(_size)
|
||||
{
|
||||
var size= _size || 280;
|
||||
var size= _size || this.sideboxSize;
|
||||
this.sideboxSizeCallback(size);
|
||||
this.appData.browser.callResizeHandler();
|
||||
},
|
||||
@ -867,7 +870,7 @@
|
||||
|
||||
$j(document).ready(function() {
|
||||
window.framework = new fw_mobile("egw_fw_sidemenu", "egw_fw_tabs",
|
||||
window.egw_webserverUrl, egw_setSideboxSize, 280, 'egw_fw_basecontainer', 'egw_fw_menu');
|
||||
window.egw_webserverUrl, egw_setSideboxSize, 350, 'egw_fw_basecontainer', 'egw_fw_menu');
|
||||
window.callManual = window.framework.callManual;
|
||||
jQuery('#egw_fw_print').click(function(){window.framework.print();});
|
||||
jQuery('#egw_fw_logout').click(function(){ window.framework.redirect(this.getAttribute('data-logout-url')); });
|
||||
|
||||
@ -4324,7 +4324,7 @@ td.message span.message {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before {
|
||||
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password:before {
|
||||
background-image: url(../images/topmenu_items/password.png);
|
||||
padding-right: 20px;
|
||||
content: "";
|
||||
@ -6309,13 +6309,13 @@ a.textSidebox {
|
||||
}
|
||||
#egw_fw_basecontainer #egw_fw_top_toolbar div.egw_fw_ui_tabs_header {
|
||||
max-height: 60px;
|
||||
width: 69%;
|
||||
width: 60%;
|
||||
margin-left: 0;
|
||||
overflow-x: scroll;
|
||||
position: initial;
|
||||
white-space: nowrap;
|
||||
position: fixed;
|
||||
left: 30%;
|
||||
left: 40%;
|
||||
top: 15px;
|
||||
height: 50px;
|
||||
}
|
||||
@ -6336,7 +6336,7 @@ a.textSidebox {
|
||||
display: none;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_logout {
|
||||
left: 235px;
|
||||
left: 310px;
|
||||
top: 20px;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
@ -6344,12 +6344,12 @@ a.textSidebox {
|
||||
z-index: 1;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_print {
|
||||
display: none;
|
||||
left: 180px;
|
||||
left: 268px;
|
||||
top: 20px;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-size: 24px 24px;
|
||||
z-index: 1;
|
||||
}
|
||||
#egw_fw_basecontainer .egw_fw_top_toolbar > div:hover {
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
|
||||
@ -6370,6 +6370,11 @@ a.textSidebox {
|
||||
background-repeat: no-repeat;
|
||||
z-index: 999;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_menu:hover {
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_menu:active {
|
||||
-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
@ -6390,8 +6395,14 @@ a.textSidebox {
|
||||
list-style-type: none;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
|
||||
display: inline;
|
||||
padding-right: 6px;
|
||||
display: -webkit-inline-box;
|
||||
display: -moz-inline-box;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
|
||||
content: " ";
|
||||
@ -6400,6 +6411,7 @@ a.textSidebox {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
background-size: 32px 32px;
|
||||
/*display:inline-block;*/
|
||||
display: none;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:before {
|
||||
@ -6433,7 +6445,7 @@ a.textSidebox {
|
||||
background-size: 32px 32px;
|
||||
display: inline-block;
|
||||
}
|
||||
#egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_preferences:before {
|
||||
#egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
|
||||
background-image: url(../images/topmenu_items/mobile/password.png);
|
||||
content: "";
|
||||
background-repeat: no-repeat;
|
||||
@ -6952,7 +6964,8 @@ a.textSidebox {
|
||||
display: none;
|
||||
}
|
||||
.sidebar-toggle #egw_fw_logout,
|
||||
.sidebar-toggle #egw_fw_topmenu_items {
|
||||
.sidebar-toggle #egw_fw_topmenu_items,
|
||||
.sidebar-toggle #egw_fw_print {
|
||||
display: none !important;
|
||||
}
|
||||
.tabs-header-portrait-collapsed {
|
||||
|
||||
@ -104,13 +104,13 @@
|
||||
#egw_fw_top_toolbar{
|
||||
div.egw_fw_ui_tabs_header{
|
||||
max-height: 60px;
|
||||
width: 69%;
|
||||
width: 60%;
|
||||
margin-left: 0;
|
||||
overflow-x: scroll;
|
||||
position: initial;
|
||||
white-space: nowrap;
|
||||
position: fixed;
|
||||
left: 30%;
|
||||
left: 40%;
|
||||
top: 15px;
|
||||
height: 50px;
|
||||
span{
|
||||
@ -134,7 +134,7 @@
|
||||
}
|
||||
//FW Logout
|
||||
div#egw_fw_logout{
|
||||
left: 235px;
|
||||
left: 310px;
|
||||
top: 20px;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
@ -144,12 +144,12 @@
|
||||
|
||||
//FW Print
|
||||
div#egw_fw_print{
|
||||
display:none; //ATM set it to not displayed
|
||||
left: 180px;
|
||||
left: 268px;
|
||||
top: 20px;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-size: 24px 24px;
|
||||
z-index: 1;
|
||||
}
|
||||
.egw_fw_top_toolbar>div:hover{
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
|
||||
@ -172,6 +172,11 @@
|
||||
background-size: 32px 32px;
|
||||
background-repeat: no-repeat;
|
||||
z-index: 999;
|
||||
&:hover {
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
}
|
||||
div#egw_fw_menu:active {
|
||||
-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
@ -191,8 +196,14 @@
|
||||
margin:0;
|
||||
list-style-type: none;
|
||||
li{
|
||||
display:inline;
|
||||
padding-right: 6px;
|
||||
display: -webkit-inline-box;
|
||||
display: -moz-inline-box;
|
||||
padding-right: 0.5em;
|
||||
&:hover {
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
}
|
||||
a#topmenu_home:before {
|
||||
content: " ";
|
||||
@ -201,6 +212,7 @@
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
background-size: 32px 32px;
|
||||
/*display:inline-block;*/
|
||||
display:none;
|
||||
}
|
||||
a#topmenu_prefs {
|
||||
@ -238,7 +250,7 @@
|
||||
background-size: 32px 32px;
|
||||
display: inline-block;
|
||||
}
|
||||
a#topmenu_preferences:before {
|
||||
a#topmenu_password:before {
|
||||
background-image: url(../images/topmenu_items/mobile/password.png);
|
||||
content: "";
|
||||
background-repeat: no-repeat;
|
||||
@ -258,7 +270,8 @@
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
a#topmenu_search:before {
|
||||
a#topmenu_search{
|
||||
&:before {
|
||||
background-image: url(../images/topmenu_items/mobile/search.png);
|
||||
content: "";
|
||||
background-repeat: no-repeat;
|
||||
@ -267,13 +280,14 @@
|
||||
background-size: 32px 32px;
|
||||
display: inline-block;
|
||||
}
|
||||
a#topmenu_search:active {
|
||||
&:active {
|
||||
transform: scale(-2);
|
||||
-webkit-transform:scale(-2);
|
||||
-webkit-transition: 1s ease;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}//End of toolbar
|
||||
|
||||
// ######################tabs header ##########################
|
||||
@ -703,7 +717,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
#egw_fw_logout, #egw_fw_topmenu_items{
|
||||
#egw_fw_logout, #egw_fw_topmenu_items, #egw_fw_print{
|
||||
display:none !important;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4313,7 +4313,7 @@ td.message span.message {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before {
|
||||
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password:before {
|
||||
background-image: url(../images/topmenu_items/password.png);
|
||||
padding-right: 20px;
|
||||
content: "";
|
||||
|
||||
BIN
pixelegg/images/category.png
Executable file
BIN
pixelegg/images/category.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 644 B |
BIN
pixelegg/images/topmenu_items/mobile/access.png
Normal file → Executable file
BIN
pixelegg/images/topmenu_items/mobile/access.png
Normal file → Executable file
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.0 KiB |
BIN
pixelegg/images/topmenu_items/mobile/password.png
Executable file → Normal file
BIN
pixelegg/images/topmenu_items/mobile/password.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 4.0 KiB |
@ -166,7 +166,7 @@
|
||||
}
|
||||
}
|
||||
/*password*/
|
||||
a#topmenu_preferences{
|
||||
a#topmenu_password{
|
||||
&:before {
|
||||
background-image: url(../images/topmenu_items/password.png);
|
||||
padding-right: 20px;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user