From 380c117f8eb2188da010d066e46c88b8153a6a52 Mon Sep 17 00:00:00 2001 From: reinerj Date: Thu, 11 Mar 2004 08:11:07 +0000 Subject: [PATCH] jerryr template changes commited --- calendar/templates/jerryr/app.css | 124 ++++++++++++++++++ calendar/templates/jerryr/day.tpl | 20 +-- calendar/templates/jerryr/footer.tpl | 32 +++++ calendar/templates/jerryr/index.tpl | 28 ++++ calendar/templates/jerryr/mini_cal.tpl | 22 ++-- calendar/templates/jerryr/view.tpl | 32 +++++ calendar/templates/jerryr/week.tpl | 13 +- calendar/templates/jerryr/year.tpl | 36 +++++ phpgwapi/templates/jerryr/css/jerryr.css | 90 +++++++++---- phpgwapi/templates/jerryr/footer.tpl | 30 ++++- .../jerryr/images/lt-lt-title-beige.png | Bin 0 -> 365 bytes .../jerryr/images/lt-mid-title-beige.png | Bin 0 -> 515 bytes .../jerryr/images/mid-title-beige.png | Bin 0 -> 220 bytes .../jerryr/images/rt-mid-title-beige.png | Bin 0 -> 478 bytes .../jerryr/images/rt-rt-title-beige.png | Bin 0 -> 425 bytes phpgwapi/templates/jerryr/navbar.tpl | 81 ++++++------ 16 files changed, 411 insertions(+), 97 deletions(-) create mode 100644 calendar/templates/jerryr/app.css create mode 100644 calendar/templates/jerryr/footer.tpl create mode 100644 calendar/templates/jerryr/index.tpl create mode 100644 calendar/templates/jerryr/view.tpl create mode 100644 calendar/templates/jerryr/year.tpl create mode 100644 phpgwapi/templates/jerryr/images/lt-lt-title-beige.png create mode 100644 phpgwapi/templates/jerryr/images/lt-mid-title-beige.png create mode 100644 phpgwapi/templates/jerryr/images/mid-title-beige.png create mode 100644 phpgwapi/templates/jerryr/images/rt-mid-title-beige.png create mode 100644 phpgwapi/templates/jerryr/images/rt-rt-title-beige.png diff --git a/calendar/templates/jerryr/app.css b/calendar/templates/jerryr/app.css new file mode 100644 index 0000000000..c25018b7a1 --- /dev/null +++ b/calendar/templates/jerryr/app.css @@ -0,0 +1,124 @@ +/* CSS Document */ +A.minicalendar +{ + color: #666666; + font-size: 12px; + +} + +A.bminicalendar +{ + color: #336699; + font-style: italic; + font-weight: bold; + font-size: 10px; +} + +A.minicalendargrey +{ + color: #999999; + font-size: 10px; + font-weight: bold; +} + +A.bminicalendargrey +{ + color: #336699; + font-style: italic; + font-size:10px; +} + +A.minicalhol +{ + padding-left:3px; + padding-right:3px; + background: #dab0b0; + color: #000000; + font-size: 10px; +} + +A.bminicalhol +{ + padding-left:3px; + padding-right:3px; + background: #dab0b0; + color: #336699; + font-size: 10px; +} + +A.minicalgreyhol +{ + padding-left:3px; + padding-right:3px; + background: #dab0b0; + color: #999999; + font-size: 10px; +} + +A.bminicalgreyhol +{ + padding-left:3px; + padding-right:3px; + background: #dab0b0; + color: #999999; + font-size: 10px; +} + + +.event-on +{ + background: #faf8f3; + border: #c9c9c9 1px solid; +} + +.event-off +{ + background: #f4f2ed; + border: #c9c9c9 1px solid; +} + +.event-holiday +{ + font-size: 100%; + background: #dac0c0; + color:#000000; + vertical-align: middle; +} + +.time +{ + background: #f4f2ed; + color:#000000; + font-size: 10px; + font-weight: bold; + vertical-align: middle; + width: 5.2%; + text-align: right; + padding-right: 5px; + line-height: 11px; + border: #c9c9c9 1px solid; +} + + +.planner-cell +{ + cursor: pointer; + cursor: hand; + border: thin solid black; +} + + +// week view + +.calendar-weekidentifier +{ + font-size:16px; + font-weight: bold; +} + +.calendar_header +{ + font-size:16px; + font-weight: bold; + text-align: center; +} diff --git a/calendar/templates/jerryr/day.tpl b/calendar/templates/jerryr/day.tpl index 3073b09d09..82d5798434 100644 --- a/calendar/templates/jerryr/day.tpl +++ b/calendar/templates/jerryr/day.tpl @@ -20,13 +20,13 @@ - - - - - + + +   + + -

{print}

+

{print}

@@ -53,11 +53,11 @@ - - + + - - + + diff --git a/calendar/templates/jerryr/footer.tpl b/calendar/templates/jerryr/footer.tpl new file mode 100644 index 0000000000..e5c71e550c --- /dev/null +++ b/calendar/templates/jerryr/footer.tpl @@ -0,0 +1,32 @@ + + + + + + +{table_row} + + + + + + + + + + + + + + + + + + + + diff --git a/calendar/templates/jerryr/week.tpl b/calendar/templates/jerryr/week.tpl index d1839ee136..005e03728a 100644 --- a/calendar/templates/jerryr/week.tpl +++ b/calendar/templates/jerryr/week.tpl @@ -1,6 +1,11 @@ {printer_friendly}
+ +
+ {label}: + {hidden_vars} + + +
+ + 		+ {b_row} + + diff --git a/calendar/templates/jerryr/index.tpl b/calendar/templates/jerryr/index.tpl new file mode 100644 index 0000000000..8c326f25cc --- /dev/null +++ b/calendar/templates/jerryr/index.tpl @@ -0,0 +1,28 @@ + +{printer_friendly} + + + + + + + + + + + +
+ {small_calendar_prev} + {prev_month_link} + {month_identifier} +
{username}		 + {next_month_link} + {small_calendar_next}
+ + + + +
{large_month}

{print} +

+ + diff --git a/calendar/templates/jerryr/mini_cal.tpl b/calendar/templates/jerryr/mini_cal.tpl index 57a29ad11a..e3f249cbf4 100644 --- a/calendar/templates/jerryr/mini_cal.tpl +++ b/calendar/templates/jerryr/mini_cal.tpl @@ -2,13 +2,13 @@ diff --git a/calendar/templates/jerryr/view.tpl b/calendar/templates/jerryr/view.tpl new file mode 100644 index 0000000000..73857649f8 --- /dev/null +++ b/calendar/templates/jerryr/view.tpl @@ -0,0 +1,32 @@ + + +
+
- +
- - - - - + + + + + @@ -18,11 +18,11 @@ - - - - - + + + + +
{month}{month}
 
+ + + +
+ + {row} + + + + + +
{button_left}
{button_center}
{button_right}
+
+ + + +
 {field}:{data}
+ {hr_text} +
+ + - -
+ + + + + + + + + diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css index 30d36fad7a..85a76d0f50 100644 --- a/phpgwapi/templates/jerryr/css/jerryr.css +++ b/phpgwapi/templates/jerryr/css/jerryr.css @@ -310,17 +310,9 @@ a.textSidebox #divAppbox { /* width:100%;*/ - background-color:#f4f2ed; + background-color:#faf8f3; padding:5px; - border-bottom-color:#9c9c9c; - border-bottom-width:1px; - 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-style:solid; + } #fmStatusBar @@ -401,7 +393,7 @@ a.textSidebox .calRowBottomShadow { - background-image: url(../images/mid-foot.png); + background: url(../images/mid-foot.png); background-repeat: repeat-x; } @@ -426,9 +418,21 @@ a.textSidebox border-bottom-style:solid; } +.calDayTitleBeige +{ + background: url(../images/mid-title-beige.png); + background-repeat: repeat-x; + height:28px; + text-align:center; + padding-bottom:0px; + font-size:14px; + font-weight:bold; + color:#666666; +} + .calDayTitleBlue { - background-image: url(../images/mid-title.png); + background: url(../images/mid-title.png); background-repeat: repeat-x; height:28px; text-align:center; @@ -452,96 +456,124 @@ a.textSidebox .calLeftShadow { - background-image: url(../images/lt-body.png); + background: url(../images/lt-body.png); padding-bottom:0px; } .calRightShadow { - background-image: url(../images/rt-body.png); + background: url(../images/rt-body.png); padding-bottom:0px; } .calLtLtTitleBlue { - background-image: url(../images/lt-lt-title.png); + background: url(../images/lt-lt-title.png); padding-bottom:0px; height:28px; } .calLtMidTitleBlue { - background-image: url(../images/lt-mid-title.png); + background: url(../images/lt-mid-title.png); padding-bottom:0px; height:28px; } .calRtMidTitleBlue { - background-image: url(../images/rt-mid-title.png); + background: url(../images/rt-mid-title.png); + padding-bottom:0px; + height:28px; +} + +.calRtMidTitleBeige +{ + background: url(../images/rt-mid-title-beige.png); + padding-bottom:0px; + height:28px; +} + +.calRtRtTitleBeige +{ + background: url(../images/rt-rt-title-beige.png); padding-bottom:0px; height:28px; } .calRtRtTitleBlue { - background-image: url(../images/rt-rt-title.png); + background: url(../images/rt-rt-title.png); + padding-bottom:0px; + height:28px; +} + +.calLtLtTitleBeige +{ + background: url(../images/lt-lt-title-beige.png); padding-bottom:0px; height:28px; } .calLtLtTitleRed { - background-image: url(../images/lt-lt-title-red.png); + background: url(../images/lt-lt-title-red.png); + padding-bottom:0px; + height:28px; +} + +.calLtMidTitleBeige +{ + background: url(../images/lt-mid-title-beige.png); padding-bottom:0px; height:28px; } .calLtMidTitleRed { - background-image: url(../images/lt-mid-title-red.png); + background: url(../images/lt-mid-title-red.png); padding-bottom:0px; height:28px; } .calRtMidTitleRed { - background-image: url(../images/rt-mid-title-red.png); + background: url(../images/rt-mid-title-red.png); padding-bottom:0px; height:28px; } .calRtRtTitleRed { - background-image: url(../images/rt-rt-title-red.png); + background: url(../images/rt-rt-title-red.png); padding-bottom:0px; height:28px; } .calLtLtFoot { - background-image: url(../images/lt-lt-foot.png); + background: url(../images/lt-lt-foot.png); padding-bottom:0px; height:17px; } .calLtMidFoot { - background-image: url(../images/lt-mid-foot.png); + background: url(../images/lt-mid-foot.png); padding-bottom:0px; height:17px; } .calRtMidFoot { - background-image: url(../images/rt-mid-foot.png); + background: url(../images/rt-mid-foot.png); padding-bottom:0px; height:17px; } .calRtRtFoot { - background-image: url(../images/rt-rt-foot.png); + background: url(../images/rt-rt-foot.png); padding-bottom:0px; height:17px; } @@ -590,13 +622,13 @@ a.textSidebox .calDayViewShadowBox { border-top-color:#9c9c9c; - border-top-width:1px; + border-top-width:2px; border-top-style:solid; border-left-color:#9c9c9c; - border-left-width:1px; + border-left-width:2px; 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; diff --git a/phpgwapi/templates/jerryr/footer.tpl b/phpgwapi/templates/jerryr/footer.tpl index 8808916f76..7776b6cd2e 100755 --- a/phpgwapi/templates/jerryr/footer.tpl +++ b/phpgwapi/templates/jerryr/footer.tpl @@ -1,9 +1,27 @@ -
@@ -25,7 +30,7 @@
- +
+ +
@@ -44,7 +49,7 @@ - + @@ -52,4 +57,6 @@
 
- +
diff --git a/calendar/templates/jerryr/year.tpl b/calendar/templates/jerryr/year.tpl new file mode 100644 index 0000000000..932eff1428 --- /dev/null +++ b/calendar/templates/jerryr/year.tpl @@ -0,0 +1,36 @@ + +{print} +
+ + + + +
+ + + + + + {row} + +
+ {left_link} + + {year_text} + + {right_link} +

{printer_friendly} +

+
+ + + +		 + {mini_month} +
- - -
+ + + + + + + + + + + + + +
+ + + + + + + + +
 
+
{page_generation_time} diff --git a/phpgwapi/templates/jerryr/images/lt-lt-title-beige.png b/phpgwapi/templates/jerryr/images/lt-lt-title-beige.png new file mode 100644 index 0000000000000000000000000000000000000000..6ee4d2cea0dd52d23d2427ffbc587969c5926dc7 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^96&6?!2~2PYh?xkDb50q$YKTt?hX)UeA=h!2^3^6 z@$_|NzrxJHBFTUH=C02`A=whwh!W@g+}zZ>5(ej@)Wnk16ovB4k_?5Aj8p}8Pv3y| zDXMuug^xX5978H@U7fHo>#%`9+fwI4H@tng&IVjkRGgB+v2co$e0&|BwEsMwrW>17 zbt11Tu6=w(FXgOn`Tg?tAFhHE&xlT_@A4H?dRBREnaOD*MV3DcgS-@vTz}5qv$9yv zbJE?i;v4(#c5KpFI_3TH#oy)FZk5K)TDJSGT9;Gunb3^2-HR$>_gB21npM|Qye?B} z?bpjinQLvs(^~)uVIV8f-jrc9}775cNoYW zo0-RS@9W!s6^*3^-j>gen~KGbbI(}E?zo{U?kvZ#2pRo-j1z0000TbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAXI2&AV*0}Q14_VZU6uQc}YY;RCwBDl0j<|Q51#0tFHm43kwyj(bSqw2)b9O zE(F1U+-|xH2rgV$i|wLS$WU|bJ9v0+dpq0AfZKVV_jm5Uee-&h54X1N_If=_I6FOg_H+zL zO0o&|``1r*k1-a-)yb#Ng7tb01b1JQ<>ArsW|ob|`IEhYu#K=0mdn-Q(Q*I5&a0O% z0F%j(JX~CU$+9~K2hZigkc0qkU0i-0?GNSdl3cFlgm@hXkNR?fWFRmD1wkqSkjzXj zGXfAoXrwJoBFO?EcY#4_Gb9uM$%Q4Yw!i`qB_zxYNlJH;N^#UCkU>KL!9n22w4L=GH%@ouThu(Y_1|#8Nx;T&&c?_KT8c-!G?(o@ zbjHERG&lYDzD6aNMj?@ZETX+3Hu3)}KPCEv+djOPeCp=4)H+7jm#zu+46oIJrZafD L`njxgN@xNA+&D&b literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/jerryr/images/rt-mid-title-beige.png b/phpgwapi/templates/jerryr/images/rt-mid-title-beige.png new file mode 100644 index 0000000000000000000000000000000000000000..52f945bda5e791d16bcfe9362f4bd321fddffdb3 GIT binary patch literal 478 zcmV<40U`d0P)l47dM*#Qs5Bm>~C7H}jviw!My;`kSyd(h<2nY}a zVR2!egQtG36evPS$ElYDAY1^5AYk5P&}2B2ug9ANh{`|b7ClUW45Wes1XXWl0!T>0 zgd{R4iOekI9WsFhH4+fT;3^9tC~$&8jx3iLrb~i13)T$;i~z(iLsrN(*#PpD{GQ-e z-pq>l91Vt1`G1v%%U*~qtA%Tq+DRI1fxe7Dp2OO(rHK0n+|tCJ*u00Q*Z U5|0?Ic>n+a07*qoM6N<$f}=RY9{>OV literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/jerryr/images/rt-rt-title-beige.png b/phpgwapi/templates/jerryr/images/rt-rt-title-beige.png new file mode 100644 index 0000000000000000000000000000000000000000..e146b8f2f85cb1e405ae867235509c58868918e1 GIT binary patch literal 425 zcmV;a0apHrP)rq|Tw>Q_5XuMb~j4`c8Wm#Ek?`PBXdY$KaUDsdW z`DMA^@4Ma3BpRn_sz}NMw!Od~CGVXJM$6s;bIb%gn?;QIy7* zPPfC%MNu>(5P;ooXN+xnmSt&-0YCt>)&NKd07|I?VCHuGb`^4NcUTZV -
+
@@ -84,40 +84,45 @@ -
{current_app_title}
-
- - - - - - - - - - - +
- - - - -
-
{lang_title}
-
- - - - - -
-
-
- -
- - - - - -
{icon_or_star}{lang_item}
+ + + + + + + +
{current_app_title}
+ + + +
+
+ + + + + + + + + + + +
+ + +
+
{lang_title}
+
+ + + +
+
+
+
+ + +
{icon_or_star}{lang_item}