diff --git a/addressbook/templates/jerryr/index.tpl b/addressbook/templates/jerryr/index.tpl new file mode 100644 index 0000000000..800e523369 --- /dev/null +++ b/addressbook/templates/jerryr/index.tpl @@ -0,0 +1,79 @@ + + +
+{lang_showing} +
{searchreturn} +{search_filter} + + + +
{alphalinks}
+
+ + +
+ + +{cols} + + + + + + + + + + {columns} + + + + + + + + + + +{delete_button} + +
{lang_actions} +  {select_all}
{col_data} 
{actions}
 
+
+ + + + + + +
+ + + + + + +
+
+ + +{char} + diff --git a/addressbook/templates/jerryr/view.tpl b/addressbook/templates/jerryr/view.tpl new file mode 100644 index 0000000000..f07023e1e7 --- /dev/null +++ b/addressbook/templates/jerryr/view.tpl @@ -0,0 +1,54 @@ + +
+ + + + +
+ + + + + + + +{cols} + +
{display_col}:{ref_data}
+		 + +
+ + + + + + + + +
Month Calendar
Feature Not Yet Available
+
+ + +
+ + +
+ + + + + + + +
+ {edit_button} + + {copy_button} + + {vcard_button} + + {done_button} +
+
+ diff --git a/calendar/templates/jerryr/day.tpl b/calendar/templates/jerryr/day.tpl new file mode 100644 index 0000000000..b72e801dc5 --- /dev/null +++ b/calendar/templates/jerryr/day.tpl @@ -0,0 +1,50 @@ + + +{printer_friendly} + + + + + + +
+ + + + {day_events} +
{date}  {username} 
+

{print}

+ 		+
+ + + + + + + + +
{date}
{small_calendar}
+
+
+ +
+ + + + + + + +
{lang_todos}
{todos}
+
+
+ + + + +{daily_events} + + + + diff --git a/calendar/templates/jerryr/edit.tpl b/calendar/templates/jerryr/edit.tpl new file mode 100644 index 0000000000..cea1b9778c --- /dev/null +++ b/calendar/templates/jerryr/edit.tpl @@ -0,0 +1,49 @@ + + + +
+ + +
+{common_hidden} +
+ + + + +{row} + + + + +
+
{errormsg}
+
+ + + +
 {cancel_button}
+ 		{delete_button}
+
+ +
+ + + +  {field}: + {data} + + + + + + {hr_text} + + + diff --git a/calendar/templates/jerryr/head.tpl b/calendar/templates/jerryr/head.tpl new file mode 100644 index 0000000000..d483005ad2 --- /dev/null +++ b/calendar/templates/jerryr/head.tpl @@ -0,0 +1,13 @@ + + +{row} + + + + + {header_column} +
+ + +{str} + diff --git a/calendar/templates/jerryr/mini_cal.tpl b/calendar/templates/jerryr/mini_cal.tpl new file mode 100644 index 0000000000..36a1669182 --- /dev/null +++ b/calendar/templates/jerryr/mini_cal.tpl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + +
    {month}{prevmonth}  {nextmonth}
+ + {daynames} {display_monthweek}
+
+ + + {monthweek_day} + + + + {dayname} + diff --git a/calendar/templates/jerryr/week.tpl b/calendar/templates/jerryr/week.tpl new file mode 100644 index 0000000000..b3d211b7d3 --- /dev/null +++ b/calendar/templates/jerryr/week.tpl @@ -0,0 +1,30 @@ + +{printer_friendly} + + + + + + + + +
+ {small_calendar_prev} + + {prev_week_link} + + {small_calendar_this} + + {next_week_link} + + {small_calendar_next} +
+
+ + +
+ {week_identifier}  {username} +
+ +{week_display}
+{print} diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css index 891d055d0b..2c694457cd 100644 --- a/phpgwapi/templates/jerryr/css/jerryr.css +++ b/phpgwapi/templates/jerryr/css/jerryr.css @@ -218,8 +218,8 @@ a.textSidebox #divLogo { position:absolute; - left:2px; - top:5px; + left:10px; + top:10px; z-index:51; } @@ -229,7 +229,6 @@ a.textSidebox border-top-color:#9c9c9c; border-top-width:1px; border-top-style:solid; - background-image: url(../images/background-icon-bar.png); background-repeat: repeat-x } @@ -264,6 +263,8 @@ a.textSidebox { background-color:white; padding-left:5px; + padding-right:5px; + padding-bottom:5px; width: 100%; } #divSideboxContainer @@ -298,8 +299,11 @@ a.textSidebox border-left-width:1px; border-left-style:solid; border-right-color:#9c9c9c; - border-right-width:1px; + border-right-width:2px; border-right-style:solid; + border-bottom-color:#9c9c9c; + border-bottom-width:1px; + border-bottom-style:solid; } #divAppbox @@ -308,13 +312,13 @@ a.textSidebox background-color:#faf8f3; padding:5px; border-bottom-color:#9c9c9c; - border-bottom-width:1px; + border-bottom-width:2px; border-bottom-style:solid; border-left-color:#9c9c9c; border-left-width:1px; border-left-style:solid; border-right-color:#9c9c9c; - border-right-width:1px; + border-right-width:2px; border-right-style:solid; } @@ -394,3 +398,97 @@ a.textSidebox width:99%; } +.titleBarBackGround +{ + background-image: url(../images/appbox-header-background.png); + height:22px; + background-repeat: repeat-x; + text-align:center; + border-top-color:#9c9c9c; + border-top-width:1px; + border-top-style:solid; + border-left-color:#9c9c9c; + border-left-width:1px; + border-left-style:solid; + border-right-color:#9c9c9c; + border-right-width:1px; + border-right-style:solid; + border-bottom-color:#9c9c9c; + border-bottom-width:1px; + border-bottom-style:solid; +} + +.calDayView +{ + background-image: url(../images/appbox-header-background.png); + height:22px; + background-repeat: repeat-x; + text-align:center; + padding-bottom:0px; + font-size:14px; + font-weight:bold; + color:#666666; + border-top-color:#9c9c9c; + border-top-width:1px; + border-top-style:solid; + border-left-color:#9c9c9c; + border-left-width:1px; + border-left-style:solid; + border-right-color:#9c9c9c; + border-right-width:1px; + border-right-style:solid; + border-bottom-color:#9c9c9c; + border-bottom-width:1px; + border-bottom-style:solid; +} + +.calDayViewSideBoxes +{ + border-top-color:#9c9c9c; + border-top-width:1px; + border-top-style:solid; + border-left-color:#9c9c9c; + border-left-width:1px; + border-left-style:solid; + border-right-color:#9c9c9c; + border-right-width:2px; + border-right-style:solid; + border-bottom-color:#9c9c9c; + border-bottom-width:2px; + border-bottom-style:solid; + background-color:#faf8f3; +} + +.calDayViewShadowBox +{ + border-top-color:#9c9c9c; + border-top-width:2px; + border-top-style:solid; + border-left-color:#9c9c9c; + border-left-width:2px; + border-left-style:solid; + border-right-color:#9c9c9c; + border-right-width:1px; + border-right-style:solid; + border-bottom-color:#9c9c9c; + border-bottom-width:1px; + border-bottom-style:solid; + background-color:#ffffff; + padding:5px; +} + +.addBookAlphaLinks +{ + border-top-color:#9c9c9c; + border-top-width:1px; + border-top-style:solid; + border-left-color:#9c9c9c; + border-left-width:1px; + border-left-style:solid; + border-right-color:#9c9c9c; + border-right-width:1px; + border-right-style:solid; + border-bottom-color:#9c9c9c; + border-bottom-width:1px; + border-bottom-style:solid; +} diff --git a/phpgwapi/templates/jerryr/images/first-grey.png b/phpgwapi/templates/jerryr/images/first-grey.png index 85dc51ece7..cc1ad29732 100755 Binary files a/phpgwapi/templates/jerryr/images/first-grey.png and b/phpgwapi/templates/jerryr/images/first-grey.png differ diff --git a/phpgwapi/templates/jerryr/images/first.png b/phpgwapi/templates/jerryr/images/first.png index d4f0bd8ecd..6f96553028 100755 Binary files a/phpgwapi/templates/jerryr/images/first.png and b/phpgwapi/templates/jerryr/images/first.png differ diff --git a/phpgwapi/templates/jerryr/images/home.png b/phpgwapi/templates/jerryr/images/home.png new file mode 100755 index 0000000000..8abff182f0 Binary files /dev/null and b/phpgwapi/templates/jerryr/images/home.png differ diff --git a/phpgwapi/templates/jerryr/images/last-grey.png b/phpgwapi/templates/jerryr/images/last-grey.png index 63ec9439ff..b758a4ae7a 100755 Binary files a/phpgwapi/templates/jerryr/images/last-grey.png and b/phpgwapi/templates/jerryr/images/last-grey.png differ diff --git a/phpgwapi/templates/jerryr/images/last.png b/phpgwapi/templates/jerryr/images/last.png index 41c9bdcf3b..84747213de 100755 Binary files a/phpgwapi/templates/jerryr/images/last.png and b/phpgwapi/templates/jerryr/images/last.png differ diff --git a/phpgwapi/templates/jerryr/images/left-grey.png b/phpgwapi/templates/jerryr/images/left-grey.png index 48bde94970..c10f28ca95 100755 Binary files a/phpgwapi/templates/jerryr/images/left-grey.png and b/phpgwapi/templates/jerryr/images/left-grey.png differ diff --git a/phpgwapi/templates/jerryr/images/left.png b/phpgwapi/templates/jerryr/images/left.png index fab1be0338..89973e7ca7 100755 Binary files a/phpgwapi/templates/jerryr/images/left.png and b/phpgwapi/templates/jerryr/images/left.png differ diff --git a/phpgwapi/templates/jerryr/images/logo.png b/phpgwapi/templates/jerryr/images/logo.png index 55387c9653..2da628bfa4 100644 Binary files a/phpgwapi/templates/jerryr/images/logo.png and b/phpgwapi/templates/jerryr/images/logo.png differ diff --git a/phpgwapi/templates/jerryr/images/logout.png b/phpgwapi/templates/jerryr/images/logout.png new file mode 100644 index 0000000000..c82f022993 Binary files /dev/null and b/phpgwapi/templates/jerryr/images/logout.png differ diff --git a/phpgwapi/templates/jerryr/images/right-grey.png b/phpgwapi/templates/jerryr/images/right-grey.png index 9991869ccd..365166cbf1 100755 Binary files a/phpgwapi/templates/jerryr/images/right-grey.png and b/phpgwapi/templates/jerryr/images/right-grey.png differ diff --git a/phpgwapi/templates/jerryr/images/right.png b/phpgwapi/templates/jerryr/images/right.png index dccf069aa2..e7fb910ac0 100755 Binary files a/phpgwapi/templates/jerryr/images/right.png and b/phpgwapi/templates/jerryr/images/right.png differ diff --git a/phpgwapi/templates/jerryr/navbar.inc.php b/phpgwapi/templates/jerryr/navbar.inc.php index b86ec5cbb1..62f657a75d 100644 --- a/phpgwapi/templates/jerryr/navbar.inc.php +++ b/phpgwapi/templates/jerryr/navbar.inc.php @@ -43,7 +43,7 @@ $show_menu_event = 'onClick'; } - + $applications = ''; // == 'icons_and_text') @@ -56,7 +56,8 @@ foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data) { - if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout') + //if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout') + if($app != 'preferences' && $app != 'about') { $title = $GLOBALS['phpgw_info']['apps'][$app]['title']; $icon = '' . $title . ''; @@ -64,7 +65,7 @@ if($i<$max_icons) { $app_icons .= ''; } - else // generate extra icon layer | always shows icons and text + // else // generate extra icon layer | always shows icons and text + else // generate extra icon layer shows icons and/or text { - $app_extra_icons .= ''; - if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target']) + $app_extra_icons .= ''; + + if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text') { - $app_extra_icons .= ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"'; + $app_extra_icons .= ''; } - $app_extra_icons .= '>' . $icon . ''; - $app_extra_icons .= ''; + + $app_extra_icons .= ''; } - $app_extra_icons .= '>' . $title . ''; + unset($icon); + unset($title); + $i++; } - - unset($icon); - unset($title); - $i++; } + +// $var['app_icons'] = $app_icons; + if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text') + { + $var['app_icons'] = $app_icons; } - $var['app_icons'] = $app_icons; - - if($i > $max_icons) - { - $app_extra_icons_div = ' - + if($i > $max_icons) + { + $app_extra_icons_div = ' +