mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
add menual and about egroupware, lay-out improvements to startmenu and the textmenu's
This commit is contained in:
Pim Snel
parent
15e32ce762
commit
0589aacb9e
@ -10,7 +10,7 @@ body, html
|
||||
scrollbar-track-color : #e0e0e0;
|
||||
top: 0;
|
||||
left: 0;
|
||||
margin: 0;
|
||||
margin: 0px 5px 5px 5px;
|
||||
padding: 0;
|
||||
padding-top: 0px;
|
||||
background-color: #ffffff;
|
||||
@ -99,12 +99,11 @@ td
|
||||
list-style: none;
|
||||
height: 20px;
|
||||
width:100%;
|
||||
background-color:#eeeeee;
|
||||
position: fixed;
|
||||
margin:0;
|
||||
background-color: #ffffff;
|
||||
top:0;
|
||||
left:0;
|
||||
background-color:#dedede;
|
||||
z-index: 900;
|
||||
border-bottom: 1px solid #9c9c9c;
|
||||
}
|
||||
@ -114,28 +113,31 @@ td
|
||||
display:block;
|
||||
text-decoration:none;
|
||||
margin: 0px;
|
||||
padding-left: 3px;
|
||||
padding-right: 3px;
|
||||
}
|
||||
|
||||
|
||||
#nav>li a
|
||||
{
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
#nav>ul
|
||||
{
|
||||
height: 20px;
|
||||
}
|
||||
#nav a:hover, #nav a:active
|
||||
{
|
||||
display:block;
|
||||
background-color:#2773fe;
|
||||
border: 0px solid #000;
|
||||
color:#ffffff;
|
||||
padding-left: 3px;
|
||||
padding-right: 3px;
|
||||
}
|
||||
|
||||
#nav ul {
|
||||
padding-top: 0px;
|
||||
margin-top:5px;
|
||||
background-color:#eeeeee;
|
||||
border-bottom: 1px solid #666666;
|
||||
border-top: 1px solid #666666;
|
||||
margin-top:3px;
|
||||
border: 1px solid #9c9c9c;
|
||||
display:none;
|
||||
border-style: outset;
|
||||
min-width:100px;
|
||||
margin-left: 0px;
|
||||
padding-left: 0px;
|
||||
@ -144,6 +146,7 @@ td
|
||||
|
||||
#nav ul ul,#nav ul
|
||||
{
|
||||
background-color:#eeeeee;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
@ -154,7 +157,7 @@ background-color:#2773fe;
|
||||
color:white;
|
||||
}
|
||||
|
||||
#nav li, #nav li:hover
|
||||
#nav>li, #nav>li:hover
|
||||
{
|
||||
padding: 0;
|
||||
padding-top: 2px;
|
||||
@ -165,7 +168,7 @@ color:white;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
#nav li:hover ul
|
||||
#nav>li:hover ul
|
||||
{
|
||||
display:block;
|
||||
}
|
||||
@ -188,12 +191,6 @@ color:white;
|
||||
color:white;
|
||||
}
|
||||
|
||||
a.textSidebox,a.textSidebox:active
|
||||
{
|
||||
display:block;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.divLoginbox
|
||||
{
|
||||
position:relative;
|
||||
|
||||
@ -82,25 +82,28 @@ img#backstretched {
|
||||
|
||||
#launchmenu ul
|
||||
{
|
||||
display: block;
|
||||
|
||||
display: block;
|
||||
list-style-type: none;
|
||||
float: left;
|
||||
margin: 0;
|
||||
margin-left: -1px;
|
||||
margin-left: -1px;
|
||||
width: 235px;
|
||||
padding: 0;
|
||||
border: 1px solid #7e7e7e;
|
||||
/*border-left:0;*/
|
||||
background-color: #FFF;
|
||||
}
|
||||
#launchmenu ul li
|
||||
{
|
||||
display: block;
|
||||
width: 240px;
|
||||
margin-right: 2px;
|
||||
margin-left: 2px;
|
||||
padding: 0;
|
||||
/* width: 240px;*/
|
||||
/* margin-right: 2px;
|
||||
margin-left: 2px;*/
|
||||
height: 22px;
|
||||
/* padding: 2px 0px 2px 0px;*/
|
||||
clear: both;
|
||||
float: left;
|
||||
/* float: left;*/
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
@ -110,38 +113,39 @@ img#backstretched {
|
||||
float: left;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin: 1px;
|
||||
margin-right: 10px;
|
||||
margin: 0px 10px 0px 3px;
|
||||
}
|
||||
#launchmenu ul li a
|
||||
{
|
||||
display: block;
|
||||
font-size: 16px;
|
||||
margin: 2px;
|
||||
text-decoration: none;
|
||||
overflow: hidden;
|
||||
height: 20px;
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
padding-top:2px;
|
||||
text-decoration: none;
|
||||
overflow: hidden;
|
||||
/* height: 20px;*/
|
||||
}
|
||||
#launchmenu ul li a:hover
|
||||
{
|
||||
display: block;
|
||||
border: 1px solid #A24533;
|
||||
background-color:#2773fe;
|
||||
color:white;
|
||||
/* border: 1px solid #A24533;
|
||||
margin: 1px;
|
||||
padding-right: 3px;
|
||||
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
#launchmenu ul li.programs
|
||||
{
|
||||
background-color: #F00;
|
||||
background-image: url('../js/x-desktop/xDT/skins/IDOTS2/menu_back.png');
|
||||
margin: 0;
|
||||
width: 235px;
|
||||
padding-left: 10px;
|
||||
height: 23px;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
border-bottom: 1px solid #7e7e7e;
|
||||
margin: 0;
|
||||
width: 235px;
|
||||
/* padding-left: 10px;*/
|
||||
height: 23px;
|
||||
/* padding-top: 2px;
|
||||
padding-bottom: 2px;*/
|
||||
border-bottom: 1px solid #7e7e7e;
|
||||
|
||||
}
|
||||
#launchmenu ul li.programs img
|
||||
@ -157,6 +161,7 @@ img#backstretched {
|
||||
|
||||
}
|
||||
|
||||
|
||||
#launchinfo {
|
||||
float: left;
|
||||
background: #CCC;
|
||||
@ -164,6 +169,7 @@ img#backstretched {
|
||||
height: 100%;
|
||||
display: hidden;
|
||||
}
|
||||
|
||||
#tasks {
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
@ -439,6 +439,7 @@ function launchSize(forceResize)
|
||||
function launchSizeAll(forceResize)
|
||||
{
|
||||
var iconpath = xDT.resPath() + 'skins/IDOTS2';
|
||||
var divideAmount= 22.5;
|
||||
if(forceResize || !launchInit)
|
||||
{
|
||||
launchInit = true;
|
||||
@ -472,12 +473,12 @@ function launchSizeAll(forceResize)
|
||||
|
||||
document.getElementById('launchinfo').style.height = divHeight + "px";
|
||||
|
||||
maxItems = Math.floor((divHeight / 25)-1);
|
||||
maxItems = Math.floor((divHeight / divideAmount)-1);
|
||||
|
||||
margin = divHeight % 25;
|
||||
margin = divHeight % divideAmount;
|
||||
if(maxItems >= totItems)
|
||||
{
|
||||
margin += (maxItems - totItems) * 25;
|
||||
margin += (maxItems - totItems) * divideAmount;
|
||||
}
|
||||
|
||||
document.getElementById('launchmenu').style.top = (margin)+ "px";
|
||||
@ -530,7 +531,8 @@ function launchSizeAll(forceResize)
|
||||
|
||||
function launchSizeIE(forceResize) {
|
||||
var iconpath = xDT.resPath() + 'skins/IDOTS2';
|
||||
if(forceResize || !launchInit)
|
||||
var divideAmount= 23;
|
||||
if(forceResize || !launchInit)
|
||||
{
|
||||
|
||||
launchInit = true;
|
||||
@ -556,19 +558,18 @@ function launchSizeIE(forceResize) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
totItems = listItems.length;
|
||||
taskHeight = document.getElementById('taskbar').clientHeight;
|
||||
divHeight = getWindowHeight()-(taskHeight);
|
||||
|
||||
|
||||
|
||||
maxItems = Math.floor((divHeight / 23)-1);
|
||||
maxItems = Math.floor((divHeight / divideAmount)-1);
|
||||
|
||||
margin = divHeight % 23;
|
||||
margin = divHeight % divideAmount;
|
||||
if(maxItems >= totItems)
|
||||
{
|
||||
margin += (maxItems - totItems) * 23;
|
||||
margin += (maxItems - totItems) * divideAmount;
|
||||
}
|
||||
|
||||
document.getElementById('launchmenu').style.bottom = taskHeight + "px";
|
||||
@ -713,4 +714,4 @@ function makeTime() {
|
||||
{
|
||||
setTimeout("makeTime()", 1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -317,11 +317,27 @@
|
||||
// Show the menu
|
||||
$menu_title = lang('Help');
|
||||
$file = array(
|
||||
array(
|
||||
'text' => lang('About %1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']),
|
||||
'no_lang' => True,
|
||||
'link' => $GLOBALS['phpgw_info']['navbar']['about']['url']
|
||||
)
|
||||
array(
|
||||
'text' => lang('%1 Manual',$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']),
|
||||
'no_lang' => True,
|
||||
'link' => $GLOBALS['phpgw_info']['navbar']['manual']['url']
|
||||
),
|
||||
array(
|
||||
'text' => '<hr style="border:0;border-bottom:dashed 1px #444444;height:1px;color:#444444;">',
|
||||
'no_lang' => True
|
||||
),
|
||||
array(
|
||||
'text' => lang('About %1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']),
|
||||
'no_lang' => True,
|
||||
'link' => $GLOBALS['phpgw_info']['navbar']['about']['url']
|
||||
),
|
||||
array(
|
||||
'text' => lang('About eGroupware'),
|
||||
'no_lang' => True,
|
||||
'link' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/about.php',
|
||||
//below is how it aught to be
|
||||
// 'link' => 'javascript:openX(\'about\',\''.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/about.php'.'\')'
|
||||
),
|
||||
);
|
||||
|
||||
$var['menu_link'] = '';
|
||||
@ -331,8 +347,6 @@
|
||||
$GLOBALS['idots2_tpl']->set_var($var);
|
||||
$GLOBALS['idots2_tpl']->pparse('out','appbox');
|
||||
|
||||
|
||||
|
||||
$var['sideboxcolend'] = '';
|
||||
|
||||
$GLOBALS['idots2_tpl']->set_var($var);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user