Author: hnategh
New Revision: 55893
URL: http://svn.stylite.de/viewvc/egroupware?rev=55893&view=rev
Log:
Mobile theme:
- Implement top menu items ( preferences, acl, …) under avatar action
Modified:
trunk/jdots/inc/class.jdots_framework.inc.php
trunk/jdots/js/fw_mobile.js
trunk/pixelegg/css/mobile.css
trunk/pixelegg/css/mobile.less
trunk/pixelegg/head_mobile.tpl
trunk/pixelegg/mobile/fw_mobile.css
trunk/pixelegg/mobile/fw_mobile.less
— trunk/jdots/inc/class.jdots_framework.inc.php (original)
+++ trunk/jdots/inc/class.jdots_framework.inc.php Wed Apr 27 17:51:28 2016
@@ -434,8 +434,7 @@
}
}
$id = $app_data[‘id’] ? $app_data[‘id’] : ($app_data[‘name’] ? $app_data[‘name’] : $app_data[‘title’]);
— trunk/jdots/js/fw_mobile.js (original)
+++ trunk/jdots/js/fw_mobile.js Wed Apr 27 17:51:28 2016
@@ -360,12 +360,11 @@
var $avatar = jQuery('#egw_fw_userinfo .avatar img');
$avatar.attr('src', egw.webserverUrl + '/index.php?menuaction=addressbook.addressbook_ui.photo&account_id=' + egw.user('account_id'));
-
$avatar.click(function(){
-
egw.open_link(egw.link('/index.php',{
-
menuaction:'addressbook.addressbook_ui.edit',
-
'account_id':egw.user('account_id')
-
}),'addressbook','popup');
-
$avatar.off().on('click',function(){
-
$sidebar.toggleClass('avatarSubmenu',!$sidebar.hasClass('avatarSubmenu'));
});
$apps.attr('style','');
$apps.off().on('click',function(){
— trunk/pixelegg/css/mobile.css (original)
+++ trunk/pixelegg/css/mobile.css Wed Apr 27 17:51:28 2016
@@ -6104,97 +6104,64 @@
box-shadow: none;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items {
- width: 280px;
- display: inline;
- float: left;
- position: absolute;
- padding: 8px 5px 0 50px;
- width: 100%;
- display: block;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items ul {
- display: inline-block;
padding: 0;
margin: 0;
list-style-type: none;
- width: 100%;
- backgroud-color: white;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
display: -webkit-inline-box;
display: -moz-inline-box;
- display: block;
padding: 2px;
- margin-left: 20px;
- width: 90%;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
- content: " ";
- background-image: url(…/images/topmenu_items/mobile/home.png);
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul li a {
- background-position: left;
- padding-left: 3em;
- color: #636363;
- font-size: 14px;
- line-height: 30px;
- text-decoration: none;
- width: 100%;
background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- /display:inline-block;/
- display: none;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:before {
- content: “”;
- background-image: url(…/images/topmenu_items/mobile/setup.png);
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
background-size: 24px 24px;
display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_acl:before {
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home,
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_logout {
- display: none;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home {
- background-image: url(…/images/topmenu_items/mobile/home.png);
- display: none;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs {
- background-image: url(…/images/topmenu_items/mobile/setup.png);
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_acl {
background-image: url(…/images/topmenu_items/mobile/access.png);
- display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_cats:before {
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_cats {
background-image: url(…/images/topmenu_items/mobile/category.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password {
background-image: url(…/images/topmenu_items/mobile/password.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_manual:before {
- background-image: url(…/images/topmenu_items/mobile/help.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search:before {
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search {
background-image: url(…/images/topmenu_items/mobile/search.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- background-position: center;
}
body #egw_fw_basecontainer #egw_fw_userinfo {
height: 60px;
@@ -6342,6 +6309,9 @@
/.background-clip(padding-box);/
background-color: #b4b4b4;
}
- body #egw_fw_sidebar.avatarSubmenu {
- top: 203px;
- }
body #egw_fw_sidebar {
top: 55px;
bottom: 5px;
@@ -6424,37 +6394,13 @@
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
- -webkit-border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 0px;
- -webkit-border-bottom-left-radius: 0px;
- -webkit-border-top-left-radius: 27px;
- -moz-border-radius-topright: 5px;
- -moz-border-radius-bottomright: 0px;
- -moz-border-radius-bottomleft: 0px;
- -moz-border-radius-topleft: 27px;
- border-top-right-radius: 5px;
- border-bottom-right-radius: 0px;
- border-bottom-left-radius: 0px;
- border-top-left-radius: 27px;
- /.background-clip(padding-box);/
- border-radius: 0;
}
body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active: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);
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
- -webkit-border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 0px;
- -webkit-border-bottom-left-radius: 0px;
- -webkit-border-top-left-radius: 27px;
- -moz-border-radius-topright: 5px;
- -moz-border-radius-bottomright: 0px;
- -moz-border-radius-bottomleft: 0px;
- -moz-border-radius-topleft: 27px;
- border-top-right-radius: 5px;
- border-bottom-right-radius: 0px;
- border-bottom-left-radius: 0px;
- border-top-left-radius: 27px;
- /.background-clip(padding-box);/
- border-radius: 0;
}
body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active:focus {
background-image: url("…/images/ajax-loader.gif");
— trunk/pixelegg/css/mobile.less (original)
+++ trunk/pixelegg/css/mobile.less Wed Apr 27 17:51:28 2016
@@ -226,104 +226,60 @@
box-shadow: none;
}
div#egw_fw_topmenu_items{
-
width: 280px;
-
display: inline;
-
float: left;
-
position: absolute;
-
padding:8px 5px 0 50px;
-
width: 100%;
-
display: block;
ul{
-
}
-
-
a#topmenu_home:before {
-
content: " ";
-
background-image: url(../images/topmenu_items/mobile/home.png);
-
background-repeat: no-repeat;
-
width: 32px;
-
height: 32px;
-
background-size: 24px 24px;
-
/*display:inline-block;*/
-
display:none;
-
}
-
a#topmenu_prefs {
-
&:before {
-
content: "";
-
background-image: url(../images/topmenu_items/mobile/setup.png);
-
width: 32px;
-
height: 32px;
background-size: 24px 24px;
display: inline-block;
-
background-position: center;
-
}
-
}
-
-
a#topmenu_acl:before {
-
content: "";
-
background-repeat: no-repeat;
-
width: 32px;
-
height: 32px;
-
background-size: 24px 24px;
-
}
-
}
-
a#topmenu_home, a#topmenu_logout {display: none;}
-
a#topmenu_home {
-
background-image: url(../images/topmenu_items/mobile/home.png);
-
display: none;
-
}
-
a#topmenu_prefs {
-
background-image: url(../images/topmenu_items/mobile/setup.png);
-
}
-
a#topmenu_acl {
background-image: url(../images/topmenu_items/mobile/access.png);
-
content: "";
-
background-repeat: no-repeat;
-
width: 32px;
-
height: 32px;
-
background-size: 24px 24px;
-
display: inline-block;
-
background-position: center;
-
}
-
a#topmenu_password:before {
-
content: "";
-
background-repeat: no-repeat;
-
width: 32px;
-
height: 32px;
-
background-size: 24px 24px;
-
display: inline-block;
-
background-position: center;
-
}
-
-
a#topmenu_manual:before {
-
background-image: url(../images/topmenu_items/mobile/help.png);
-
content: "";
-
background-repeat: no-repeat;
-
width: 32px;
-
height: 32px;
-
background-size: 24px 24px;
-
display: inline-block;
-
}
-
-
&:before {
background-image: url(../images/topmenu_items/mobile/search.png);
-
content: "";
-
background-repeat: no-repeat;
-
width: 32px;
-
height: 32px;
-
background-size: 24px 24px;
-
display: inline-block;
-
background-position: center;
-
}
}
}
}
@@ -480,6 +436,7 @@
//# SIDEBAR #
//# #
//###################
@@ -548,8 +505,8 @@
h1 {text-transform: uppercase; font-size: 12px; .color_100_gray; padding-top: 4px;padding-left:32px;}
-
&:hover {.box_shadow_standard_light_hover; .border_radius ( 5px, 0px, 0px, 27px );}
-
&:active {.box_shadow_standard_light_active; .border_radius ( 5px, 0px, 0px, 27px );}
— trunk/pixelegg/head_mobile.tpl (original)
+++ trunk/pixelegg/head_mobile.tpl Wed Apr 27 17:51:28 2016
@@ -46,7 +46,7 @@
— trunk/pixelegg/mobile/fw_mobile.css (original)
+++ trunk/pixelegg/mobile/fw_mobile.css Wed Apr 27 17:51:28 2016
@@ -6115,97 +6115,64 @@
box-shadow: none;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items {
- width: 280px;
- display: inline;
- float: left;
- position: absolute;
- padding: 8px 5px 0 50px;
- width: 100%;
- display: block;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items ul {
- display: inline-block;
padding: 0;
margin: 0;
list-style-type: none;
- width: 100%;
- backgroud-color: white;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
display: -webkit-inline-box;
display: -moz-inline-box;
- display: block;
padding: 2px;
- margin-left: 20px;
- width: 90%;
}
body #egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
- content: " ";
- background-image: url(…/images/topmenu_items/mobile/home.png);
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul li a {
- background-position: left;
- padding-left: 3em;
- color: #636363;
- font-size: 14px;
- line-height: 30px;
- text-decoration: none;
- width: 100%;
background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- /display:inline-block;/
- display: none;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:before {
- content: “”;
- background-image: url(…/images/topmenu_items/mobile/setup.png);
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
background-size: 24px 24px;
display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_acl:before {
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home,
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_logout {
- display: none;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home {
- background-image: url(…/images/topmenu_items/mobile/home.png);
- display: none;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs {
- background-image: url(…/images/topmenu_items/mobile/setup.png);
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_acl {
background-image: url(…/images/topmenu_items/mobile/access.png);
- display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_cats:before {
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_cats {
background-image: url(…/images/topmenu_items/mobile/category.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password {
background-image: url(…/images/topmenu_items/mobile/password.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- background-position: center;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_manual:before {
- background-image: url(…/images/topmenu_items/mobile/help.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search:before {
- }
- body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search {
background-image: url(…/images/topmenu_items/mobile/search.png);
- content: “”;
- background-repeat: no-repeat;
- width: 32px;
- height: 32px;
- background-size: 24px 24px;
- display: inline-block;
- background-position: center;
}
body #egw_fw_basecontainer #egw_fw_userinfo {
height: 60px;
@@ -6353,6 +6320,9 @@
/.background-clip(padding-box);/
background-color: #b4b4b4;
}
- body #egw_fw_sidebar.avatarSubmenu {
- top: 203px;
- }
body #egw_fw_sidebar {
top: 55px;
bottom: 5px;
@@ -6435,37 +6405,13 @@
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
- -webkit-border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 0px;
- -webkit-border-bottom-left-radius: 0px;
- -webkit-border-top-left-radius: 27px;
- -moz-border-radius-topright: 5px;
- -moz-border-radius-bottomright: 0px;
- -moz-border-radius-bottomleft: 0px;
- -moz-border-radius-topleft: 27px;
- border-top-right-radius: 5px;
- border-bottom-right-radius: 0px;
- border-bottom-left-radius: 0px;
- border-top-left-radius: 27px;
- /.background-clip(padding-box);/
- border-radius: 0;
}
body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active: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);
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
- -webkit-border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 0px;
- -webkit-border-bottom-left-radius: 0px;
- -webkit-border-top-left-radius: 27px;
- -moz-border-radius-topright: 5px;
- -moz-border-radius-bottomright: 0px;
- -moz-border-radius-bottomleft: 0px;
- -moz-border-radius-topleft: 27px;
- border-top-right-radius: 5px;
- border-bottom-right-radius: 0px;
- border-bottom-left-radius: 0px;
- border-top-left-radius: 27px;
- /.background-clip(padding-box);/
- border-radius: 0;
}
body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active:focus {
background-image: url("…/images/ajax-loader.gif");
@@ -7037,16 +6983,8 @@
background: white;
}
body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items {
- width: 245px;
- display: inline;
- float: left;
- position: absolute;
- padding-left: 50px;
- padding-right: 5px;
- background: white;
height: 100%;
z-index: 998;
- border-right: 2px solid silver;
}
body #egw_fw_basecontainer #egw_fw_sidebar {
z-index: 999;
@@ -7171,6 +7109,9 @@
background-position: 15px center;
margin-left: 8px;
}
- body #egw_fw_basecontainer {
- /* active app header*/
- }
body #egw_fw_basecontainer #egw_fw_main {
margin-top: 0px;
}
@@ -7200,35 +7141,44 @@
body #egw_fw_basecontainer #egw_fw_top_toolbar #egw_fw_appsToggle.toggled {
background-image: url(…/images/sidebar.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items {
- padding-top: 8px;
- }
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_logout:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul {
- border-left: 6px solid silver;
- }
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_logout {
background-image: url(…/images/logout.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_home:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_home {
background-image: url(…/images/home.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_prefs:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_prefs {
background-image: url(…/images/setup.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_acl:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_acl {
background-image: url(…/images/lock.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_cats:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_cats {
background-image: url(…/images/tag_message.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_password:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_password {
background-image: url(…/images/password.svg);
}
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_manual:before {
- background-image: url(…/images/help.svg);
- }
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_search:before {
- body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_search {
background-image: url(…/images/search.svg);
}
body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_menu {
background-image: url(…/images/topmenu_items/mobile/menu_active.svg);
- }
- body #egw_fw_basecontainer #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active {
- margin-left: 2px;
- }
- body #egw_fw_basecontainer #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active img {
- height: 32px;
- padding: 0;
- padding-left: 14px;
- }
- body #egw_fw_basecontainer #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active h1 {
- font-size: 14px;
- padding-left: 57px;
}
body #egw_fw_basecontainer #egw_fw_sidemenu img[src$=".svg"] {
background: none;
— trunk/pixelegg/mobile/fw_mobile.less (original)
+++ trunk/pixelegg/mobile/fw_mobile.less Wed Apr 27 17:51:28 2016
@@ -189,16 +189,8 @@
width: 300px;
background: white;
div#egw_fw_topmenu_items{
@@ -339,38 +331,29 @@
background-image:url(…/images/sidebar.svg);
}
div#egw_fw_topmenu_items {
-
a#topmenu_manual:before {
-
background-image: url(../images/help.svg);
-
}
-
a#topmenu_search{
-
&:before {
-
background-image: url(../images/search.svg);
-
}
@@ -379,6 +362,24 @@
background-image: url(…/images/topmenu_items/mobile/menu_active.svg);
}
}
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs