From 670bda71e343ded0dc330b0611020dbeea105611 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 20 Mar 2012 15:26:34 +0000 Subject: [PATCH] Move CSS into proper position --- etemplate/inc/class.etemplate_new.inc.php | 11 +-- etemplate/js/test/gfx/selectcols.png | Bin 215 -> 0 bytes .../default/etemplate2.css} | 78 ++++++++---------- .../default/images}/ajax-loader.gif | Bin .../default/images}/arrows.png | Bin .../default/images}/close.png | Bin .../gfx => templates/default/images}/down.png | Bin .../default/images}/email.png | Bin .../default/images}/error.png | Bin .../default/images}/focused_hatching.png | Bin .../default/images}/gradient01.png | Bin .../default/images}/gradient01.svg | 0 .../default/images}/gradient02.png | Bin .../default/images}/gradient02.svg | 0 .../default/images}/header_overlay.png | Bin .../gfx => templates/default/images}/hint.png | Bin .../default/images}/non_loaded_bg.png | Bin .../default/images}/phone.png | Bin .../default/images}/tab_header_bg.png | Bin .../gfx => templates/default/images}/tick.png | Bin .../gfx => templates/default/images}/up.png | Bin .../gfx => templates/default/images}/url.png | Bin 22 files changed, 39 insertions(+), 50 deletions(-) delete mode 100644 etemplate/js/test/gfx/selectcols.png rename etemplate/{js/test/test.css => templates/default/etemplate2.css} (90%) rename etemplate/{js/test/gfx => templates/default/images}/ajax-loader.gif (100%) rename etemplate/{js/test/gfx => templates/default/images}/arrows.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/close.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/down.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/email.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/error.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/focused_hatching.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/gradient01.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/gradient01.svg (100%) rename etemplate/{js/test/gfx => templates/default/images}/gradient02.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/gradient02.svg (100%) rename etemplate/{js/test/gfx => templates/default/images}/header_overlay.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/hint.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/non_loaded_bg.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/phone.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/tab_header_bg.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/tick.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/up.png (100%) rename etemplate/{js/test/gfx => templates/default/images}/url.png (100%) diff --git a/etemplate/inc/class.etemplate_new.inc.php b/etemplate/inc/class.etemplate_new.inc.php index 0e33e93653..b948d1da54 100644 --- a/etemplate/inc/class.etemplate_new.inc.php +++ b/etemplate/inc/class.etemplate_new.inc.php @@ -105,10 +105,6 @@ class etemplate_new extends etemplate_widget_template // Include the etemplate2 javascript code egw_framework::validate_file('.', 'etemplate2', 'etemplate'); - // Include the jQuery-UI CSS - many more complex widgets use it - $theme = 'smoothness'; - egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.8.16.custom.css"); - if (!$this->rel_path) throw new egw_exception_assertion_failed('No (valid) template read!'); // generate new etemplate request object @@ -151,7 +147,12 @@ class etemplate_new extends etemplate_widget_template // missing dependency, thought egw:uses jquery.jquery.tools does NOT work, maybe we should rename it to jquery-tools // egw_framework::validate_file('jquery','jquery.tools.min'); - egw_framework::includeCSS('/etemplate/js/test/test.css'); + egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css'); + + // Include the jQuery-UI CSS - many more complex widgets use it + $theme = 'smoothness'; + egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.8.16.custom.css"); + common::egw_header(); if ($output_mode != 2) { diff --git a/etemplate/js/test/gfx/selectcols.png b/etemplate/js/test/gfx/selectcols.png deleted file mode 100644 index 57bd26f88e28b948c7dbe03b2dd753fc15a4aabe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^AT}ol8<6B)wpSQPF%}28J29*~C-V}>VN3FMcVYMs zf(!O8pA1r4;1O92R18$gEzHO;YmNj^kiEpy*OmP?Gc&)Mis;VGyMRKnC9V-A&iT2y zsd*&~&PAz-C8;S2<(VZJ3LzP(3hti10q;{(^MDHVJY5_^BrYeXBqaPe?;v4dln~f4 z^}I)^@JtC0h9ePY4>+w!%bAyWWYLU?8R?7+QG0nAg_Mn2fjSvHUHx3vIVCg!09&Oz A`~Uy| diff --git a/etemplate/js/test/test.css b/etemplate/templates/default/etemplate2.css similarity index 90% rename from etemplate/js/test/test.css rename to etemplate/templates/default/etemplate2.css index 1d9840599c..ddb2fe0f82 100644 --- a/etemplate/js/test/test.css +++ b/etemplate/templates/default/etemplate2.css @@ -1,30 +1,12 @@ /** - * Styles for etemplate2 tests + * Styles for etemplate2 widgets * * @version: $Id$ */ -/* Stuff for the standalone test webpage */ - -body, table, td { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -/* overflow: hidden;*/ -} - -#linklist a { - color: blue; - display: block; -} - -#linklist a:visited { - color: blue; -} - -#linklist a:hover { - color: #5050FF; -} - +/** + * Top level + */ #container { /*margin: 10px; border: 1px solid gray;*/ @@ -32,12 +14,6 @@ body, table, td { background-color: white; } -.header { - color: #111; - margin: 30px 0 5px 0; - border-bottom: 1px solid #111; -} - /** * VBox widget */ @@ -74,6 +50,9 @@ div.et2_hbox_right { clear: right; } +/** + * Placeholder widget - used for un-implemented widgets + */ .et2_placeholder { display: inline-block; border: 1px solid cornflowerblue; @@ -99,6 +78,9 @@ div.et2_hbox_right { margin: 2px 0 2px 0; } +/** + * Label widget, and labels for other widgets + */ .et2_label { color: #101050; } @@ -114,15 +96,18 @@ a.et2_url { } a.et2_url.email { - background-image: url(gfx/email.png); + background-image: url(images/email.png); } a.et2_url.phone { - background-image: url(gfx/phone.png); + background-image: url(images/phone.png); } a.et2_url.url { - background-image: url(gfx/url.png); + background-image: url(images/url.png); } +/** + * Button widget - text only, and icon + */ .et2_button { cursor: pointer; text-align: center; @@ -133,7 +118,7 @@ a.et2_url.url { } .et2_button_text { background-color: #E0E0E0; - background-image: url(gfx/gradient01.png); + background-image: url(images/gradient01.png); background-position: center; background-repeat: repeat-x; @@ -153,7 +138,7 @@ button.et2_button_text:hover { background-color: #D0D0EE; } button.et2_button_text:active { - background-image: url(gfx/gradient02.png); + background-image: url(images/gradient02.png); background-color: #D0D0E0; } button.et2_button_text:focus { @@ -162,6 +147,9 @@ button.et2_button_text:focus { outline: none; } +/** + * Text box + */ .et2_textbox { resize: none; } @@ -251,7 +239,7 @@ span.et2_date span { .loading { background-position: center right; background-repeat: no-repeat; - background-image: url('gfx/ajax-loader.gif'); + background-image: url('images/ajax-loader.gif'); } /** @@ -282,7 +270,7 @@ span.et2_date span { height: 16px; float: right; display: block; - background-image: url("gfx/close.png"); + background-image: url("images/close.png"); background-position: center; background-repeat: no-repeat; } @@ -331,7 +319,7 @@ span.et2_date span { .et2_link_to span.status { background-repeat: no-repeat; background-position: 3px center; - background-image:url(gfx/tick.png); + background-image:url(images/tick.png); width: 22px; height: 22px; display: block; @@ -381,7 +369,7 @@ ul.et2_link_string { height: 16px; float: right; display: none; - background-image: url("gfx/close.png"); + background-image: url("images/close.png"); background-position: center; background-repeat: no-repeat; padding: 0px; @@ -416,7 +404,7 @@ ul.et2_link_string { border: 1px solid silver; background-color: #E0E0E0; - background-image: url(gfx/gradient01.png); + background-image: url(images/gradient01.png); background-position: center; background-repeat: repeat-x; @@ -432,7 +420,7 @@ ul.et2_link_string { } .et2_tabflag:active { - background-image: url(gfx/gradient02.png); + background-image: url(images/gradient02.png); background-color: #D0D0E0; } @@ -450,7 +438,7 @@ ul.et2_link_string { } .et2_tabheader { - background-image: url(gfx/tab_header_bg.png); + background-image: url(images/tab_header_bg.png); background-position: bottom; background-repeat: repeat-x; } @@ -541,7 +529,7 @@ label input, label span, label div, label select, label textarea { font-style: italic; background-color: #f3d4d0; border-color: #a93030; - background-image:url(gfx/error.png); + background-image:url(images/error.png); } .message.success { @@ -549,7 +537,7 @@ label input, label span, label div, label select, label textarea { background-color: #e5f3d0; color: #98a930; border-color: #9ea930; - background-image:url(gfx/tick.png); + background-image:url(images/tick.png); } .message.hint { @@ -557,7 +545,7 @@ label input, label span, label div, label select, label textarea { background-color: #d9e2ed; border-color: #56729a; color: #56729a; - background-image:url(gfx/hint.png); + background-image:url(images/hint.png); } /** @@ -604,12 +592,12 @@ label input, label span, label div, label select, label textarea { .nextmatch_sortheader.asc { font-weight: bold; - background-image: url(gfx/up.png); + background-image: url(images/up.png); } .nextmatch_sortheader.desc { font-weight: bold; - background-image: url(gfx/down.png); + background-image: url(images/down.png); } .nextmatch_resize_helper { diff --git a/etemplate/js/test/gfx/ajax-loader.gif b/etemplate/templates/default/images/ajax-loader.gif similarity index 100% rename from etemplate/js/test/gfx/ajax-loader.gif rename to etemplate/templates/default/images/ajax-loader.gif diff --git a/etemplate/js/test/gfx/arrows.png b/etemplate/templates/default/images/arrows.png similarity index 100% rename from etemplate/js/test/gfx/arrows.png rename to etemplate/templates/default/images/arrows.png diff --git a/etemplate/js/test/gfx/close.png b/etemplate/templates/default/images/close.png similarity index 100% rename from etemplate/js/test/gfx/close.png rename to etemplate/templates/default/images/close.png diff --git a/etemplate/js/test/gfx/down.png b/etemplate/templates/default/images/down.png similarity index 100% rename from etemplate/js/test/gfx/down.png rename to etemplate/templates/default/images/down.png diff --git a/etemplate/js/test/gfx/email.png b/etemplate/templates/default/images/email.png similarity index 100% rename from etemplate/js/test/gfx/email.png rename to etemplate/templates/default/images/email.png diff --git a/etemplate/js/test/gfx/error.png b/etemplate/templates/default/images/error.png similarity index 100% rename from etemplate/js/test/gfx/error.png rename to etemplate/templates/default/images/error.png diff --git a/etemplate/js/test/gfx/focused_hatching.png b/etemplate/templates/default/images/focused_hatching.png similarity index 100% rename from etemplate/js/test/gfx/focused_hatching.png rename to etemplate/templates/default/images/focused_hatching.png diff --git a/etemplate/js/test/gfx/gradient01.png b/etemplate/templates/default/images/gradient01.png similarity index 100% rename from etemplate/js/test/gfx/gradient01.png rename to etemplate/templates/default/images/gradient01.png diff --git a/etemplate/js/test/gfx/gradient01.svg b/etemplate/templates/default/images/gradient01.svg similarity index 100% rename from etemplate/js/test/gfx/gradient01.svg rename to etemplate/templates/default/images/gradient01.svg diff --git a/etemplate/js/test/gfx/gradient02.png b/etemplate/templates/default/images/gradient02.png similarity index 100% rename from etemplate/js/test/gfx/gradient02.png rename to etemplate/templates/default/images/gradient02.png diff --git a/etemplate/js/test/gfx/gradient02.svg b/etemplate/templates/default/images/gradient02.svg similarity index 100% rename from etemplate/js/test/gfx/gradient02.svg rename to etemplate/templates/default/images/gradient02.svg diff --git a/etemplate/js/test/gfx/header_overlay.png b/etemplate/templates/default/images/header_overlay.png similarity index 100% rename from etemplate/js/test/gfx/header_overlay.png rename to etemplate/templates/default/images/header_overlay.png diff --git a/etemplate/js/test/gfx/hint.png b/etemplate/templates/default/images/hint.png similarity index 100% rename from etemplate/js/test/gfx/hint.png rename to etemplate/templates/default/images/hint.png diff --git a/etemplate/js/test/gfx/non_loaded_bg.png b/etemplate/templates/default/images/non_loaded_bg.png similarity index 100% rename from etemplate/js/test/gfx/non_loaded_bg.png rename to etemplate/templates/default/images/non_loaded_bg.png diff --git a/etemplate/js/test/gfx/phone.png b/etemplate/templates/default/images/phone.png similarity index 100% rename from etemplate/js/test/gfx/phone.png rename to etemplate/templates/default/images/phone.png diff --git a/etemplate/js/test/gfx/tab_header_bg.png b/etemplate/templates/default/images/tab_header_bg.png similarity index 100% rename from etemplate/js/test/gfx/tab_header_bg.png rename to etemplate/templates/default/images/tab_header_bg.png diff --git a/etemplate/js/test/gfx/tick.png b/etemplate/templates/default/images/tick.png similarity index 100% rename from etemplate/js/test/gfx/tick.png rename to etemplate/templates/default/images/tick.png diff --git a/etemplate/js/test/gfx/up.png b/etemplate/templates/default/images/up.png similarity index 100% rename from etemplate/js/test/gfx/up.png rename to etemplate/templates/default/images/up.png diff --git a/etemplate/js/test/gfx/url.png b/etemplate/templates/default/images/url.png similarity index 100% rename from etemplate/js/test/gfx/url.png rename to etemplate/templates/default/images/url.png