From 7ee5fab89c8ef14f442e686a23635e4a6fd3f2ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Tue, 18 Nov 2014 15:11:13 +0100 Subject: [PATCH] =?utf8?q?Stylesheets:=20Aufr=C3=A4umaktion?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - gemeinsame stylesheets aus den kivitendo/lx-office-erp Verzeichnissen genommen - README aktualisiert - rp/bwa nicht mehr hartcodiert in kivitendo laden --- SL/Form.pm | 2 +- bin/mozilla/rp.pl | 1 + css/README.stylesheets | 45 +++++-- css/{lx-office-erp => }/background_jobs.css | 0 css/{kivitendo => }/bwa.css | 0 css/common.css | 52 ++++++++ css/{kivitendo => }/csshover.htc | 0 .../jquery.autocomplete.css | 0 css/jquery.contextMenu.css | 0 .../jquery.multiselect2side.css | 0 css/kivitendo/background_jobs.css | 1 - css/kivitendo/jquery.autocomplete.css | 1 - css/kivitendo/jquery.multiselect2side.css | 1 - css/kivitendo/main.css | 64 --------- css/lx-office-erp/csshover.htc | 121 ------------------ css/lx-office-erp/main.css | 66 ---------- css/lx-office-erp/menu.css | 4 - templates/webpages/rp/bwa.html | 2 - 18 files changed, 85 insertions(+), 275 deletions(-) rename css/{lx-office-erp => }/background_jobs.css (100%) rename css/{kivitendo => }/bwa.css (100%) create mode 100644 css/common.css rename css/{kivitendo => }/csshover.htc (100%) rename css/{lx-office-erp => }/jquery.autocomplete.css (100%) mode change 100755 => 100644 css/jquery.contextMenu.css rename css/{lx-office-erp => }/jquery.multiselect2side.css (100%) delete mode 120000 css/kivitendo/background_jobs.css delete mode 120000 css/kivitendo/jquery.autocomplete.css delete mode 120000 css/kivitendo/jquery.multiselect2side.css delete mode 100644 css/lx-office-erp/csshover.htc diff --git a/SL/Form.pm b/SL/Form.pm index 171b5fff4..e35464a57 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -467,7 +467,7 @@ sub header { # standard css for all # this should gradually move to the layouts that need it $layout->use_stylesheet("$_.css") for qw( - main menu list_accounts jquery.autocomplete + main menu common list_accounts jquery.autocomplete jquery.multiselect2side ui-lightness/jquery-ui jquery-ui.custom diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index c2ca6939d..02023f532 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -1849,6 +1849,7 @@ sub generate_bwa { $form->{title} = $locale->text('BWA'); + $::request->layout->add_stylesheets('bwa.css'); $form->header; print $form->parse_html_template('rp/bwa'); diff --git a/css/README.stylesheets b/css/README.stylesheets index 388672ac0..5478cea71 100644 --- a/css/README.stylesheets +++ b/css/README.stylesheets @@ -1,16 +1,33 @@ -2012-03-02 - Stylesheet normalization +Some notes about stylesheets: -After this, the stylesheets follow these conventions: +* NOT every directory in css/ is considered a style to be chosen. The available + stylesheets are hardcoded in at least 3 places: + - SL/Auth.pm:read_user + - SL/Controller/Admin.pm:init_stylesheets + - bin/mozilla/am.pl:config + yes it sucks. change it, if you like. -* Every directory in css/ is considered a style to be chosen. -* lx-office-erp is used as the fallback style if no style was found or the - style chosen was invalid. -* Missing stylesheets for the other styles have been - linked from lx-office-erp, so that they will used like before. -* If you edit a file, make sure it's not a symlink. -* The previous named stylesheets are now main.css in their respective directories. -* menuv3 and menuv4 are now distict so that it's possible to include both - without overriding each other. -* All relative image links needed to get bumped an additional ../ -* If you add another style, be sure to test tabs, calendars, all menus, - autocompletion, charts, and multiselect. +* If a stylesheet is requests from controller code, it is searched in this order: + - css// + - css/ + - + + so common libraries can be put higher here, to be included by any stylesheet + +* 'kivitendo' is used as the fallback style if no style was found or the style + chosen was invalid. + +* Pay attention to the position of relative image urls. Most should not be + included in css anyway but should use the generated icon maps. For the rest, + a couple of ../ may be needed to get the right path. + +* If you edit another styles, these are things that are known to get broken. + Be sure to test them thoroughly: + - tabs + - calendars + - all menus + - autocompletion (parts/customers) + - charts of accounts + - multiselect + - ckeeditor + - jquery-ui widgets (i hate those things) diff --git a/css/lx-office-erp/background_jobs.css b/css/background_jobs.css similarity index 100% rename from css/lx-office-erp/background_jobs.css rename to css/background_jobs.css diff --git a/css/kivitendo/bwa.css b/css/bwa.css similarity index 100% rename from css/kivitendo/bwa.css rename to css/bwa.css diff --git a/css/common.css b/css/common.css new file mode 100644 index 000000000..ffb5e1829 --- /dev/null +++ b/css/common.css @@ -0,0 +1,52 @@ + +/* class for numeric columns in tables */ +.numeric { text-align: right } + +/* various oneshot decoration for legacy purpose. dont use */ +.small-text { font-size: 70% } +.bold { font-weight: bold } + +.float-left { float: left } +.float-right { float: right } + +/* quirk to force certain constructs to block context */ +.block-context { overflow: hidden } + +/* position */ +.position-relative { position: relative } +.position-absolute { position: absolute } + + +/* media stuff */ +@media screen { .noscreen { display: none } } +@media print { .noprint { display: none } } +@media handheld { .nomobile { display: none } } + +body { behavior:url("csshover.htc") } + +/* class to fix container around floats */ +.clearfix:after { + clear:both; + content:"."; + display:block; + font-size:0; + height:0; + visibility:hidden; +} + +/* CTI */ +a.cti_call_action { + display: inline-block; + padding-left: 18px; + height: 16px; + position: relative; + top: 2px; + vertical-align: center; + background-image: url(../../image/icons/16x16/phone.png); + background-repeat: no-repeat; +} + +/* the cvars table in the 2. row */ +.row2-cvars-table tr { vertical-align: top } +.row2-cvars-table th { text-align: right; padding-left: 15px; padding-right: 0 } +.row2-cvars-table td, .row2-cvars-table th { padding-top: 10px } diff --git a/css/kivitendo/csshover.htc b/css/csshover.htc similarity index 100% rename from css/kivitendo/csshover.htc rename to css/csshover.htc diff --git a/css/lx-office-erp/jquery.autocomplete.css b/css/jquery.autocomplete.css similarity index 100% rename from css/lx-office-erp/jquery.autocomplete.css rename to css/jquery.autocomplete.css diff --git a/css/jquery.contextMenu.css b/css/jquery.contextMenu.css old mode 100755 new mode 100644 diff --git a/css/lx-office-erp/jquery.multiselect2side.css b/css/jquery.multiselect2side.css similarity index 100% rename from css/lx-office-erp/jquery.multiselect2side.css rename to css/jquery.multiselect2side.css diff --git a/css/kivitendo/background_jobs.css b/css/kivitendo/background_jobs.css deleted file mode 120000 index 8031c949e..000000000 --- a/css/kivitendo/background_jobs.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/background_jobs.css \ No newline at end of file diff --git a/css/kivitendo/jquery.autocomplete.css b/css/kivitendo/jquery.autocomplete.css deleted file mode 120000 index dc1123169..000000000 --- a/css/kivitendo/jquery.autocomplete.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.autocomplete.css \ No newline at end of file diff --git a/css/kivitendo/jquery.multiselect2side.css b/css/kivitendo/jquery.multiselect2side.css deleted file mode 120000 index 270f1a248..000000000 --- a/css/kivitendo/jquery.multiselect2side.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.multiselect2side.css \ No newline at end of file diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index c11c5fe5a..c66187ea6 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -309,19 +309,6 @@ fieldset { color: black; font-weight: bolder; } -/* media stuff */ -@media screen { -.noscreen { -/* items with this class won't display */ - display: none; -} -} -@media print { -.noprint { -/* items with this class won't print */ - display: none; -} -} .filecontent { border: 1px solid blue; padding-left: 2px; @@ -334,13 +321,6 @@ label { .unbalanced_ledger { background-color: #ffa0a0; } -.clearfix:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} .flash_message_error { background-color: #FFD6D6; border: 1px solid #AE0014; @@ -377,33 +357,6 @@ label { margin-right: 6px; } -.small-text { - font-size: 0.75em; -} - -.float-left { - float: left; -} -.float-right { - float: right; -} - -.block-context { - overflow: hidden; -} - -.position-relative { - position: relative; -} - -.position-absolute { - position: absolute; -} - -.part_picker { - padding-right: 16px; -} - .customer-vendor-picker-undefined, .partpicker-undefined { color: red; @@ -449,20 +402,3 @@ div.ppp_line span.ppp_block_sellprice { span.toggle_selected { font-weight: bold; } - -/* CTI */ -a.cti_call_action { - display: inline-block; - padding-left: 18px; - height: 16px; - position: relative; - top: 2px; - vertical-align: center; - background-image: url(../../image/icons/16x16/phone.png); - background-repeat: no-repeat; -} - -/* the cvars table in the 2. row */ -.row2-cvars-table tr {vertical-align: top;} -.row2-cvars-table th {text-align: right; padding-left: 15px; padding-right: 0;} -.row2-cvars-table td, .row2-cvars-table th {padding-top: 10px;} diff --git a/css/lx-office-erp/csshover.htc b/css/lx-office-erp/csshover.htc deleted file mode 100644 index e2dcced3e..000000000 --- a/css/lx-office-erp/csshover.htc +++ /dev/null @@ -1,121 +0,0 @@ - - \ No newline at end of file diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index 09ba80409..812879ade 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -296,10 +296,6 @@ div.admin { color: green; } -td.numeric { /* class for numeric columns in tables */ - text-align: right -} - h2.confirm { color: blue; font-size: 14pt; @@ -316,19 +312,6 @@ fieldset { font-weight: bolder; } -/* media stuff */ - -@media screen { - .noscreen { /* items with this class won't display */ - display: none; - } -} - -@media print { - .noprint { /* items with this class won't print */ - display: none; - } -} .filecontent { border: 1px solid blue; @@ -344,15 +327,6 @@ label { background-color: #ffa0a0; } -.clearfix:after { - clear:both; - content:"."; - display:block; - font-size:0; - height:0; - visibility:hidden; -} - .flash_message_error { background-color:#FFD6D6; border: 1px solid #AE0014; @@ -429,29 +403,6 @@ label { margin-right: 6px; } -.small-text { - font-size: 0.75em; -} - -.float-left { - float: left; -} -.float-right { - float: right; -} - -.block-context { - overflow: hidden; -} - -.position-relative { - position: relative; -} - -.position-absolute { - position: absolute; -} - .part_picker { padding-right: 16px; } @@ -498,20 +449,3 @@ div.ppp_line span.ppp_block_sellprice { span.toggle_selected { font-weight: bold; } - -/* CTI */ -a.cti_call_action { - display: inline-block; - padding-left: 18px; - height: 16px; - position: relative; - top: 2px; - vertical-align: center; - background-image: url(../../image/icons/16x16/phone.png); - background-repeat: no-repeat; -} - -/* the cvars table in the 2. row */ -.row2-cvars-table tr {vertical-align: top;} -.row2-cvars-table th {text-align: right; padding-left: 15px; padding-right: 0;} -.row2-cvars-table td, .row2-cvars-table th {padding-top: 10px;} diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css index 42eb844f7..5ebbd85c1 100644 --- a/css/lx-office-erp/menu.css +++ b/css/lx-office-erp/menu.css @@ -25,10 +25,6 @@ body.menunew { margin:0px; } -body { -behavior:url("csshover.htc"); -} - #menuv3 { width:99.8%; float:left; diff --git a/templates/webpages/rp/bwa.html b/templates/webpages/rp/bwa.html index 52d291e2c..50c323fa0 100644 --- a/templates/webpages/rp/bwa.html +++ b/templates/webpages/rp/bwa.html @@ -2,8 +2,6 @@ [%- USE HTML %] [%- USE LxERP %] - - -- 2.20.1
[% company %]