[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18559] switch to css more - this is still a WIP
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [18559] switch to css more - this is still a WIP |
|
Date: |
Sun, 01 Jun 2008 01:09:18 +0000 |
Revision: 18559
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18559
Author: skwashd
Date: 2008-06-01 01:09:18 +0000 (Sun, 01 Jun 2008)
Log Message:
-----------
switch to css more - this is still a WIP
Modified Paths:
--------------
trunk/phpgwapi/templates/verdilak/css/styles.css
trunk/phpgwapi/templates/verdilak/head.inc.php
trunk/phpgwapi/templates/verdilak/head.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 01:08:37 UTC
(rev 18558)
+++ trunk/phpgwapi/templates/verdilak/css/styles.css 2008-06-01 01:09:18 UTC
(rev 18559)
@@ -1,27 +1,20 @@
-
-body,p,td,th,table,input,form,option
+body, p, td, th, table, input, form, option
{
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 10pt;
- font-style: normal;
- font-weight: normal;
- line-height: normal;
- text-decoration: none;
- letter-spacing: 0em;
- word-spacing: 0em;
+ color: #000;
+ font-family: "Liberation Sans", Verdana, sans-serif;
+ font-size: 1em;
}
body
{
- margin-right: 0em;
- margin-left: 0em;
- margin-top: 0em;
- margin-bottom: 0em;
+ background-color: #fff;
+ margin: 0;
+ padding: 0;
}
img, input[type=image]
{
- border: 0px;
+ border: 0;
}
table
@@ -31,7 +24,7 @@
td.alarm
{
- color: #FF0000;
+ color: #f00;
}
a:link,a:visited,a:active,a:hover
@@ -91,16 +84,6 @@
padding-top: 5px;
}
-body,p,td,th,table,input,form,option
-{
- color: #000000;
-}
-
-body
-{
- background-color: #FFFFFF;
-}
-
a:link,a:visited,a:active
{
color: mediumblue;
@@ -108,54 +91,54 @@
a:hover
{
- color: #cc0000;
+ color: #c00;
}
.navbar,.th,.app_header
{
- background-color: #80BBFF;
+ background-color: #80bbff;
}
.login,.portal,.about
{
- background-color: #80BBFF;
- border-color: #000000;
+ background-color: #80bbff;
+ border-color: #000;
}
.portal_text,.info
{
- color: #FFFFFF;
+ color: #fff;
}
.row_on,.th_bright
{
- background-color: #CCEEFF;
+ background-color: #cef;
}
.msgbox
{
- background-color: #FFFFFF;
+ background-color: #ffffff;
}
.row_off
{
- background-color: #DDF0FF;
+ background-color: #ddf0ff;
}
.cal_today
{
- background-color: #FFFFCC;
+ background-color: #ffc;
}
.cal_dayview
{
- background-color: #C0C0C0;
+ background-color: #c0c0c0;
}
.email_folder
{
- background-color: #7090FF;
- color: #FFFFFF;
+ background-color: #7090ff;
+ color: #fff;
}
a.info,.info
@@ -234,14 +217,14 @@
.horbar {
color: #212020;
- background-color: #ECE9D8;
- border: 1px solid #FFFFFF;
+ background-color: #ece9d8;
+ border: 1px solid #fff;
}
.horbaritem {
float: left;
white-space: nowrap;
- font-family: luxi sans, verdana, geneva, arial, helvetica, sans-serif;
+ font-family: "Liberation Sans", verdana, sans-serif;
font-size: 14px;
}
@@ -251,20 +234,20 @@
}
.horbaritem a:link {
- color: #000000;
+ color: #000;
}
.horbaritem a:visited {
- color: #000000;
+ color: #000;
}
.horbaritem a:hover {
- color: #ffffff;
+ color: #fff;
background-color: #808080;
}
.horbaritem a:active {
- color: #ff0000;
+ color: #f00;
}
.verbar {
@@ -302,20 +285,20 @@
}
.item a:link {
- color: #000000;
+ color: #000;
}
.item a:visited {
- color: #000000;
+ color: #000;
}
.item a:hover {
- color: #ffffff;
+ color: #fff;
background-color: #808080;
}
.item a:active {
- color: #ff0000;
+ color: #f00;
}
.item .fwdarr {
@@ -325,12 +308,44 @@
right: 7px;
}
-TR.passed
+tr.passed
{
background-color: #d5d7d7;
}
-TR.notpassed
+tr.notpassed
{
background-color: #bd6767;
}
+
+#head_banner
+{
+ 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
+{
+ border: 0;
+ border-collapse: collapse;
+ margin: 0;
+ padding: 0;
+}
+
+#head_banner #phpgw_logo
+{
+ background: transparent url(../images/greybar.jpg) bottom left repeat-x;
+ text-align: left;
+ width: 100%;
+}
+
+#top_nav
+{
+ text-align: right;
+ vertical-align: bottom;
+ white-space: nowrap;
+}
Modified: trunk/phpgwapi/templates/verdilak/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/verdilak/head.inc.php 2008-06-01 01:08:37 UTC
(rev 18558)
+++ trunk/phpgwapi/templates/verdilak/head.inc.php 2008-06-01 01:09:18 UTC
(rev 18559)
@@ -20,38 +20,33 @@
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/verdilak/css/base.css";
-
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']) &&
file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/verdilak/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
+ if (
!is_readable("/phpgwapi/templates/idsociety/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css")
)
{
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/verdilak/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'styles';
}
- else
- {
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/verdilak/css/styles.css";
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'verdilak';
- }
- if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/base/css/base.css"))
- {
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/base/css/base.css";
- }
+ $theme_styles = array
+ (
+ '/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css',
+ '/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css',
+ '/phpgwapi/templates/base/css/base.css',
+ '/phpgwapi/templates/verdilak/css/base.css',
+
"/phpgwapi/templates/verdilak/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css",
+ "/{$app}/templates/base/css/base.css",
+ "/{$app}/templates/verdilak/css/base.css",
+
"/{$app}/templates/verdilak/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css"
+ );
- if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/verdilak/css/base.css"))
+ foreach ( $theme_styles as $style )
{
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/verdilak/css/base.css";
- }
- if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/verdilak/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css"))
- {
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/verdilak/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ if( file_exists( PHPGW_SERVER_ROOT . $style ) )
+ {
+
$GLOBALS['phpgw']->template->set_var('theme_style',
"{$GLOBALS['phpgw_info']['server']['webserver_url']}$style");
+ $GLOBALS['phpgw']->template->parse('theme_stylesheets',
'theme_stylesheet', true);
+ }
}
- foreach ( $theme_styles as $style )
- {
- $GLOBALS['phpgw']->template->set_var('theme_style', $style);
- $GLOBALS['phpgw']->template->parse('theme_stylesheets',
'theme_stylesheet', true);
- }
-
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
$GLOBALS['phpgw']->template->set_var(array
@@ -67,5 +62,3 @@
));
$GLOBALS['phpgw']->template->pfp('out','head');
-?>
-
Modified: trunk/phpgwapi/templates/verdilak/head.tpl
===================================================================
--- trunk/phpgwapi/templates/verdilak/head.tpl 2008-06-01 01:08:37 UTC (rev
18558)
+++ trunk/phpgwapi/templates/verdilak/head.tpl 2008-06-01 01:09:18 UTC (rev
18559)
@@ -10,13 +10,10 @@
<meta name="robots" content="none" />
<link rel="icon" href="{img_icon}" type="image/x-ico" />
<link rel="shortcut icon" href="{img_shortcut}" />
- {css}
- <script language="JavaScript" type="text/javascript"
src="{phpgw_root}folders/phplayersmenu/libjs/layersmenu-browser_detection.js"></script>
- <script language="JavaScript" type="text/javascript"
src="{phpgw_root}folders/phplayersmenu/libjs/layersmenu-library.js"></script>
- <script language="JavaScript" type="text/javascript"
src="{phpgw_root}folders/phplayersmenu/libjs/layersmenu.js"></script>
<!-- BEGIN theme_stylesheet -->
<link href="{theme_style}" type="text/css" rel="StyleSheet">
<!-- END theme_stylesheet -->
+ {css}
<script type="text/javascript">
<!--
var strBaseURL = '{str_base_url}';
@@ -24,7 +21,27 @@
-->
</script>
{javascript}
+ <script type="text/javascript">
+ var page;
+
+ function openwindow(url)
+ {
+ if (page)
+ {
+ if (page.closed)
+ {
+ page.stop;
+ page.close;
+ }
+ }
+ page = window.open(url,
"pageWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
+ if (page.opener == null)
+ {
+ page.opener = window;
+ }
+ }
+ </script>
<title>{website_title}</title>
</head>
- <body>
+ <body class="yui-skin-sam">
<!-- END Head -->
Modified: trunk/phpgwapi/templates/verdilak/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/verdilak/navbar.inc.php 2008-06-01 01:08:37 UTC
(rev 18558)
+++ trunk/phpgwapi/templates/verdilak/navbar.inc.php 2008-06-01 01:09:18 UTC
(rev 18559)
@@ -18,35 +18,6 @@
function parse_navbar($force = False)
{
- /* FIXME remove this rubbish
- $GLOBALS['phpgw_info']['theme']['bg_color'] = '#FFFFFF';
- $GLOBALS['phpgw_info']['theme']['bg_text'] = '#000000';
- $GLOBALS['phpgw_info']['theme']['vlink'] = 'blue';
- $GLOBALS['phpgw_info']['theme']['alink'] = 'red';
- $GLOBALS['phpgw_info']['theme']['link'] = 'blue';
- $GLOBALS['phpgw_info']['theme']['row_on'] = '#CCEEFF';
- $GLOBALS['phpgw_info']['theme']['row_off'] = '#DDF0FF';
- $GLOBALS['phpgw_info']['theme']['row_text'] = '#000000';
- $GLOBALS['phpgw_info']['theme']['th_bg'] = '#80BBFF';
- $GLOBALS['phpgw_info']['theme']['th_text'] = '#000000';
- $GLOBALS['phpgw_info']['theme']['navbar_bg'] = '#80CCFF';
- $GLOBALS['phpgw_info']['theme']['navbar_text'] = '#FFFFFF';
- $GLOBALS['phpgw_info']['theme']['table_bg'] = '#7090FF';
- $GLOBALS['phpgw_info']['theme']['table_text'] = '#000000';
- $GLOBALS['phpgw_info']['theme']['font'] = 'Arial,
Helvetica, san-serif';
- $GLOBALS['phpgw_info']['theme']['bg01'] = '#dadada';
- $GLOBALS['phpgw_info']['theme']['bg02'] = '#dad0d0';
- $GLOBALS['phpgw_info']['theme']['bg03'] = '#dacaca';
- $GLOBALS['phpgw_info']['theme']['bg04'] = '#dac0c0';
- $GLOBALS['phpgw_info']['theme']['bg05'] = '#dababa';
- $GLOBALS['phpgw_info']['theme']['bg06'] = '#dab0b0';
- $GLOBALS['phpgw_info']['theme']['bg07'] = '#daaaaa';
- $GLOBALS['phpgw_info']['theme']['bg08'] = '#da9090';
- $GLOBALS['phpgw_info']['theme']['bg09'] = '#da8a8a';
- $GLOBALS['phpgw_info']['theme']['bg10'] = '#da7a7a';
- */
-
-
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_file('navbartpl', 'navbar.tpl');
@@ -54,8 +25,6 @@
$tpl->set_block('navbartpl','navbar');
$var['img_root'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images';
- $var['table_bg_color'] =
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
- $var['navbar_text'] =
$GLOBALS['phpgw_info']['theme']['navbar_text'];
$applications = '';
$exclude = array('home', 'preferences', 'about', 'logout');
$navbar = execMethod('phpgwapi.menu.get', 'navbar');
@@ -70,27 +39,28 @@
$applications .= <<<HTML
<br>
<a href="{$app_data['url']}">
- <img src="{$icon}"
alt="{$app_data['text']}" title="{{$app_data['text']}">
+ <img src="{$icon}"
alt="{$app_data['text']}" title="{$app_data['text']}">
</a>
HTML;
}
+
$var['applications'] = $applications;
+ $var['logo'] = 'logo.png';
- if (isset($GLOBALS['phpgw_info']['theme']['special_logo']))
+ $var['home_url'] =
$GLOBALS['phpgw']->link('/home.php');
+ $var['home_text'] = lang('home');
+ $var['about_url'] =
$GLOBALS['phpgw']->link('/about.php', array('appname' =>
$GLOBALS['phpgw_info']['flags']['currentapp']) );
+ $var['about_text'] = lang('about');
+ $var['logout_url'] =
$GLOBALS['phpgw']->link('/logout.php');
+ $var['logout_text'] = lang('logout');
+
+ if ( isset($navbar['preferences']) )
{
- $var['logo'] =
$GLOBALS['phpgw_info']['theme']['special_logo'];
+ $var['preferences_url'] = $navbar['preferences']['url'];
+ $var['preferences_text'] =
$navbar['preferences']['text'];
}
- else
- {
- $var['logo'] = 'logo.png';
- }
- $var['home_link'] =
$GLOBALS['phpgw_info']['navbar']['home']['url'];
- //XXX Caeies not sure of that :(
- $var['preferences_link'] =
isset($GLOBALS['phpgw_info']['navbar']['preferences']) &&
isset($GLOBALS['phpgw_info']['navbar']['preferences']['url']) ?
$GLOBALS['phpgw_info']['navbar']['preferences']['url'] : '' ;
- $var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
- $var['help_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
{
@@ -156,7 +126,6 @@
if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
{
$var['current_app_header'] =
$GLOBALS['phpgw_info']['flags']['app_header'];
- $var['th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
}
else
{
@@ -202,7 +171,6 @@
);
$var = Array(
'img_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images',
- 'table_bg_color' =>
(isset($GLOBALS['phpgw_info']['theme']['navbar_bg'])?$GLOBALS['phpgw_info']['theme']['navbar_bg']:''),
'version' =>
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
);
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
Modified: trunk/phpgwapi/templates/verdilak/navbar.tpl
===================================================================
--- trunk/phpgwapi/templates/verdilak/navbar.tpl 2008-06-01 01:08:37 UTC
(rev 18558)
+++ trunk/phpgwapi/templates/verdilak/navbar.tpl 2008-06-01 01:09:18 UTC
(rev 18559)
@@ -1,49 +1,31 @@
<!-- BEGIN navbar -->
-<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
- var page;
-
- function openwindow(url)
- {
- if (page)
- {
- if (page.closed)
- {
- page.stop;
- page.close;
- }
- }
- page = window.open(url,
"pageWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
- if (page.opener == null)
- {
- page.opener = window;
- }
- }
-</SCRIPT>
-
-<table border="0" cellspacing="0" cellpadding="0" width="100%"
bgcolor="{table_bg_color}">
-<tr background="{img_root}/bg_filler.png">
-<td background="{img_root}/bg_filler.png" align="left" valign="bottom"><a
href="http://www.phpgroupware.org"; target="_new"><img src="{img_root}/{logo}"
border="0" alt="phpGroupWare"></a></td>
-<td background="{img_root}/bg_filler.png" align="center" valign="bottom"
width="100%"><!--<font color="{navbar_text}"
size="-1">{user_info}</font>--></td>
-<td background="{img_root}/bg_filler.png" align="right" valign="bottom"
rowspan="2" nowrap><a href="{home_link}"><img src="{welcome_img}" border="0"
alt="Welcome"></a>{preferences_icon}<a href="{logout_link}"><img
src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img
src="{img_root}/help.png" border="0" alt="Help"></a></td></tr>
-<tr background="{img_root}/bg_filler.png">
-<td align="center" width="100%" valign="bottom" colspan="2"><img
src="{img_root}/greybar.jpg" height="6" width="100%" alt="bar"></td></tr>
+<table id="head_banner">
+ <tr>
+ <td id="phpgw_logo">
+ <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>
+ </td>
+ </tr>
</table>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
- <tr valign="top">
- <td background="{img_root}/navbar_filler.jpg" align="left">
- {applications}
- </td>
- <td width="100%">
-<!-- BEGIN app_header -->
-<div style="text-align: center; font-weight: bold; background-color: {th_bg};
padding:5px">{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>
+ <tr valign="top">
+ <td background="{img_root}/navbar_filler.jpg" align="left">
+ {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>
+ <!-- END app_header -->
+ <div align="center">{messages}</div>
+ <div align="center">{sideboxcontent}</div>
+ <table border="0" cellpadding="5" width="100%">
+ <tr>
+ <td>
<!-- END navbar -->
-<!-- BEGIN preferences --><a href="{preferences_link}"><img
src="{preferences_img}" border="0" alt="Preferences"></a>
-<!-- END preferences -->
+<!-- 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] [18559] switch to css more - this is still a WIP,
Dave Hall <=