[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18563] more improvements
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [18563] more improvements |
|
Date: |
Sun, 01 Jun 2008 04:09:45 +0000 |
Revision: 18563
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18563
Author: skwashd
Date: 2008-06-01 04:09:45 +0000 (Sun, 01 Jun 2008)
Log Message:
-----------
more improvements
Modified Paths:
--------------
trunk/phpgwapi/templates/verdilak/css/styles.css
trunk/phpgwapi/templates/verdilak/footer.tpl
trunk/phpgwapi/templates/verdilak/navbar.inc.php
trunk/phpgwapi/templates/verdilak/navbar.tpl
Modified: trunk/phpgwapi/templates/verdilak/css/styles.css
===================================================================
--- trunk/phpgwapi/templates/verdilak/css/styles.css 2008-06-01 04:08:57 UTC
(rev 18562)
+++ trunk/phpgwapi/templates/verdilak/css/styles.css 2008-06-01 04:09:45 UTC
(rev 18563)
@@ -146,161 +146,81 @@
font-weight: bold;
}
-/* Used by tabs */
-ul.tabs
-{
- background-image: url('../images/tabs-bg.png');
- height: 32px;
- list-style: none;
- margin: 0px;
- padding: 0px;
-}
-
-ul.tabs li
-{
- display: block;
- float: left;
- height: 32px;
- margin: 0px;
- padding: 0px;
- width: 150px;
-}
-
-ul.tabs li a, ul.tabs li input
-{
- background-image: url('../images/tab-r.png');
- background-color: transparent;
- background-repeat: no-repeat;
- border: 0px;
- color: #000;
- display: block;
- height: 32px;
- overflow: hidden;
- padding-top: 7px;
- text-decoration: none;
- white-space: nowrap;
- width: 150px;
-}
-
-ul.tabs li.tablast
-{
- background-color: transparent;
- background-image: url('../images/tab-last.png');
- background-repeat: no-repeat;
-}
-
-ul.tabs li.activetab
-{
- background-color: transparent;
- background-image: url('../images/tab-active-bg.png');
- height: 32px;
-}
-
-ul.tabs li.activetab a
-{
- background-image: url('../images/tab-active-r.png');
- background-position: top right;
-}
-
-ul.tabs li
-{
- background-image: url('../images/tab-bg.png');
- color:#069;
- height: 32px;
- text-align: center;
- white-space: nowrap;
-}
-
/*
* Sidebox menu style
*/
- .horbar {
+.horbar
+{
color: #212020;
background-color: #ece9d8;
border: 1px solid #fff;
}
-.horbaritem {
+.horbaritem
+{
float: left;
white-space: nowrap;
font-family: "Liberation Sans", verdana, sans-serif;
font-size: 14px;
}
-.horbaritem a {
+.horbaritem a
+{
display: block;
text-decoration: none;
}
-.horbaritem a:link {
+.horbaritem a:link, .item a
+{
color: #000;
}
-.horbaritem a:visited {
- color: #000;
-}
-
-.horbaritem a:hover {
+.horbaritem a:hover, .horbaritem a:active,
+ .item a:hover, .item a:active
+{
color: #fff;
background-color: #808080;
}
-.horbaritem a:active {
- color: #f00;
-}
-
-.verbar {
+.verbar
+{
color: black;
background-color: #dcdad5;
border: 2px outset #cecac1;
}
-.submenu {
+.submenu
+{
position: absolute;
left: 0;
top: 0;
visibility: hidden;
}
-.subframe {
+.subframe
+{
position: relative;
display: block;
background-color: #dcdad5;
border: 2px solid #cecac1;
}
-.item {
+.item
+{
position: relative;
text-align: left;
white-space: nowrap;
- font-family: luxi sans, verdana, geneva, arial, helvetica, sans-serif;
font-size: 14px;
}
-.item a {
+.item a
+{
position: relative;
display: block;
text-decoration: none;
}
-.item a:link {
- color: #000;
-}
-
-.item a:visited {
- color: #000;
-}
-
-.item a:hover {
- color: #fff;
- background-color: #808080;
-}
-
-.item a:active {
- color: #f00;
-}
-
.item .fwdarr {
position: absolute;
top: 5px;
@@ -318,27 +238,22 @@
background-color: #bd6767;
}
-#head_banner
+#head_banner, #head_banner tr, #head_banner td
{
- background: #cef url(../images/bg_filler.png) scroll top left repeat;
border: 0;
border-collapse: collapse;
- height: 45px;
margin: 0;
padding: 0;
}
-#head_banner td
+#head_banner
{
- border: 0;
- border-collapse: collapse;
- margin: 0;
- padding: 0;
+ background: #3f4c6b url(../images/greybar.jpg) repeat-x scroll bottom
left;
+ height: 45px;
}
#head_banner #phpgw_logo
{
- background: transparent url(../images/greybar.jpg) bottom left repeat-x;
text-align: left;
width: 100%;
}
@@ -349,3 +264,43 @@
vertical-align: bottom;
white-space: nowrap;
}
+
+#app_header
+{
+ background-color: #ccc;
+ border-bottom: 1px solid #000;
+ font-weight: bold;
+ padding: 0.5em;
+ text-align: center;
+}
+
+#navbar
+{
+ background: #ccc url(../images/navbar_filler.jpg) top left repeat-y;
+ text-align: left;
+}
+
+#phpgw_body
+{
+ padding: 2em;
+ text-align: left;
+}
+
+#phpgw_footer
+{
+ background: #3f4c6b scroll top left repeat;
+ font-size: small;
+ padding: 0.5em 0;
+}
+
+#phpgw_footer li
+{
+ color: #fff;
+ display: inline;
+ margin-left: 5em;
+}
+
+#phpgw_footer a
+{
+ color: #ddd;
+}
Modified: trunk/phpgwapi/templates/verdilak/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/verdilak/footer.tpl 2008-06-01 04:08:57 UTC
(rev 18562)
+++ trunk/phpgwapi/templates/verdilak/footer.tpl 2008-06-01 04:09:45 UTC
(rev 18563)
@@ -8,11 +8,11 @@
</tr>
</table>
-<table border="0" cellspacing="0" cellpadding="0" width="100%"
class="{table_bg_color}">
- <tr>
- <td background="{img_root}/bg_filler.png"><font
color=white>{user_info}</font> </td>
- <td background="{img_root}/bg_filler.png" align="center">{current_users}</td>
- <td background="{img_root}/bg_filler.png" align="right"><font
color=white>{powered_by}</font></td>
- </tr>
-</table>
+<div id="phpgw_footer">
+ <ul>
+ <li>{user_info}</li>
+ <li>{current_users}</li>
+ <li>{powered_by}</li>
+ </ul>
+</div>
<!-- END footer -->
Modified: trunk/phpgwapi/templates/verdilak/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/verdilak/navbar.inc.php 2008-06-01 04:08:57 UTC
(rev 18562)
+++ trunk/phpgwapi/templates/verdilak/navbar.inc.php 2008-06-01 04:09:45 UTC
(rev 18563)
@@ -108,16 +108,7 @@
{
$api_messages = lang('it has been more then %1 days
since you changed your password',30);
}
-
- // get sidebox content and parse it as a menu
- // it's just a hack. You need to enable the folders module to
get an ouput
- if
(isset($GLOBALS['phpgw_info']['user']['apps']['folders']['enabled']) &&
$GLOBALS['phpgw_info']['user']['apps']['folders']['enabled'] == true )
- {
-
$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
- $var['sideboxcontent'] = parseMenu();
- }
-
// This is gonna change
if (isset($cd))
{
@@ -143,11 +134,14 @@
$tpl->set_var('preferences_icon','');
}
$tpl->pfp('out','navbar');
+
// If the application has a header include, we now include it
- if (address@hidden'phpgw_info']['flags']['noappheader'] &&
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
+ $menuaction = phpgw::get_var('menuaction', 'string', 'GET');
+ if ( !isset($GLOBALS['phpgw_info']['flags']['noappheader'])
+ && $menuaction )
{
- list($app,$class,$method) =
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
- if (is_array($GLOBALS[$class]->public_functions) &&
isset($GLOBALS[$class]->public_functions['header']))
+ list($app,$class,$method) = explode('.', $menuaction);
+ if ( is_array($GLOBALS[$class]->public_functions ) &&
isset($GLOBALS[$class]->public_functions['header']))
{
$GLOBALS[$class]->header();
}
Modified: trunk/phpgwapi/templates/verdilak/navbar.tpl
===================================================================
--- trunk/phpgwapi/templates/verdilak/navbar.tpl 2008-06-01 04:08:57 UTC
(rev 18562)
+++ trunk/phpgwapi/templates/verdilak/navbar.tpl 2008-06-01 04:09:45 UTC
(rev 18563)
@@ -5,27 +5,27 @@
<a href="http://www.phpgroupware.org";
target="_new"><img src="{img_root}/{logo}" border="0" alt="phpGroupWare"></a>
</td>
<td id="top_nav"><a
- href="{home_link}"><img
src="{welcome_img}"alt="Welcome"></a>{preferences_icon}<a
- href="{logout_link}"><img src="{logout_img}"
alt="Logout"></a><a
- href="{help_link}"><img src="{img_root}/help.png"
alt="Help"></a>
+ href="{home_url}"><img
src="{welcome_img}"alt="Welcome"></a>{preferences_icon}<a
+ href="{logout_url}"><img src="{logout_img}"
alt="Logout"></a><a
+ href="{help_url}"><img src="{img_root}/help.png"
alt="Help"></a>
</td>
</tr>
</table>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr valign="top">
- <td background="{img_root}/navbar_filler.jpg" align="left">
+ <td id="navbar">
{applications}
</td>
<td width="100%">
<!-- BEGIN app_header -->
- <div style="text-align: center; font-weight: bold;
background-color: #ccc; padding:5px">{current_app_header}</div>
+ <div id="app_header">{current_app_header}</div>
<!-- END app_header -->
<div align="center">{messages}</div>
<div align="center">{sideboxcontent}</div>
<table border="0" cellpadding="5" width="100%">
<tr>
- <td>
+ <td id="phpgw_body">
<!-- END navbar -->
<!-- BEGIN preferences --><a href="{preferences_link}"><img
src="{preferences_img}" border="0" alt="Preferences"></a><!-- END preferences
-->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [18563] more improvements,
Dave Hall <=