From 169ddf5aaeefbffcf5a995ef63d20241d49e1a32 Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 16 Jul 2007 12:25:48 +0000 Subject: [PATCH] some moving around and renaming of templates and static resources git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1829 fd906abe-77d9-0310-91a1-e0d9ade77398 --- agent/ui/agent.html | 10 - agent/ui/{css => resources}/base.css | 198 ++++++------- agent/ui/{css => resources}/custom.css | 2 +- agent/ui/{images => resources}/favicon.png | Bin agent/ui/{css => resources}/loops.css | 276 +++++++++--------- .../ui/{images => resources}/loops_logo2.png | Bin agent/ui/{css => resources}/print.css | 2 +- .../{css => resources}/zope3_tablelayout.css | 0 .../{AgentStart.html => templates/agent.html} | 12 +- .../{AgentJobView.html => templates/job.html} | 12 +- .../jobdetail.html} | 10 +- .../mail.html} | 10 +- agent/ui/web.py | 47 +-- 13 files changed, 287 insertions(+), 292 deletions(-) delete mode 100644 agent/ui/agent.html rename agent/ui/{css => resources}/base.css (91%) rename agent/ui/{css => resources}/custom.css (84%) rename agent/ui/{images => resources}/favicon.png (100%) rename agent/ui/{css => resources}/loops.css (90%) rename agent/ui/{images => resources}/loops_logo2.png (100%) rename agent/ui/{css => resources}/print.css (70%) rename agent/ui/{css => resources}/zope3_tablelayout.css (100%) rename agent/ui/{AgentStart.html => templates/agent.html} (85%) rename agent/ui/{AgentJobView.html => templates/job.html} (85%) rename agent/ui/{AgentJobViewDetail.html => templates/jobdetail.html} (86%) rename agent/ui/{AgentOutlookMailView.html => templates/mail.html} (86%) diff --git a/agent/ui/agent.html b/agent/ui/agent.html deleted file mode 100644 index 043c239..0000000 --- a/agent/ui/agent.html +++ /dev/null @@ -1,10 +0,0 @@ - - - loops Agent - - - -

loops Agent

- - - diff --git a/agent/ui/css/base.css b/agent/ui/resources/base.css similarity index 91% rename from agent/ui/css/base.css rename to agent/ui/resources/base.css index ff50e70..c5608fe 100644 --- a/agent/ui/css/base.css +++ b/agent/ui/resources/base.css @@ -1,99 +1,99 @@ -/* - $Id: base.css 1779 2007-06-07 19:37:44Z helmutm $ - - based on http://www.tjkdesign.com/articles/liquid/4.asp - -*/ - -body { - min-width:640px; - margin: 0; - padding: 0; - font: 9pt Verdana, Tahoma, Arial, Helvetica, sans-serif; - background-color: white; - color: #000040; -} - -#global,#menu,#sub-section,#footer { - overflow: hidden; - display: inline-block; -} - -#content { - display: inline-block; -} - -#global,#footer {width:100%} -#menu,#content,#sub-section {float:left} -#menu {width:20%} -#content {width:62%} -#sub-section {width:17%} -#footer {clear:left} - -/* more general stuff */ - -.top image { - margin-top: -1px; -} - -div.box { - margin: 12px 12px 8px 10px; - border: 1px solid #ccc; - border-bottom: none; -} - -div.box h4 { - font: 110% Verdana, Tahoma, Arial, Helvetica, sans-serif; - color: #000040; - border: none; - border-bottom: 1px solid #ccc; - padding: 4px; - padding-top: 1px; - padding-bottom: 3px; - background-color: #ddd; - height: auto; -} - -table.listing { - margin: 1px; - margin-top: 6px; - -} - -table.listing th { - font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; - color: #000040; -} - -.footer { - text-align: center; - border-top: 1px solid #ccc; - border-bottom: none; - margin-top: 12px; - padding-top: 6px; -} - -.itemViews { - border-bottom-width: 2px; -} - -.button { - margin: 1em 0 1em 0; -} - -.button a { - padding: 2px 4px 2px 4px; - background-color: #e8e8e8; - text-decoration: None; - color: Black; - border-width: 2px; - border-style: solid; - border-color: #f4f4f4 #989898 #989898 #f4f4f4; -} - -pre { - background-color: #f4f4f4; -} - -#footer { border-bottom: none; } - +/* + $Id$ + + based on http://www.tjkdesign.com/articles/liquid/4.asp + +*/ + +body { + min-width:640px; + margin: 0; + padding: 0; + font: 9pt Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color: white; + color: #000040; +} + +#global,#menu,#sub-section,#footer { + overflow: hidden; + display: inline-block; +} + +#content { + display: inline-block; +} + +#global,#footer {width:100%} +#menu,#content,#sub-section {float:left} +#menu {width:20%} +#content {width:62%} +#sub-section {width:17%} +#footer {clear:left} + +/* more general stuff */ + +.top image { + margin-top: -1px; +} + +div.box { + margin: 12px 12px 8px 10px; + border: 1px solid #ccc; + border-bottom: none; +} + +div.box h4 { + font: 110% Verdana, Tahoma, Arial, Helvetica, sans-serif; + color: #000040; + border: none; + border-bottom: 1px solid #ccc; + padding: 4px; + padding-top: 1px; + padding-bottom: 3px; + background-color: #ddd; + height: auto; +} + +table.listing { + margin: 1px; + margin-top: 6px; + +} + +table.listing th { + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + color: #000040; +} + +.footer { + text-align: center; + border-top: 1px solid #ccc; + border-bottom: none; + margin-top: 12px; + padding-top: 6px; +} + +.itemViews { + border-bottom-width: 2px; +} + +.button { + margin: 1em 0 1em 0; +} + +.button a { + padding: 2px 4px 2px 4px; + background-color: #e8e8e8; + text-decoration: None; + color: Black; + border-width: 2px; + border-style: solid; + border-color: #f4f4f4 #989898 #989898 #f4f4f4; +} + +pre { + background-color: #f4f4f4; +} + +#footer { border-bottom: none; } + diff --git a/agent/ui/css/custom.css b/agent/ui/resources/custom.css similarity index 84% rename from agent/ui/css/custom.css rename to agent/ui/resources/custom.css index 15b15c1..05f3f75 100644 --- a/agent/ui/css/custom.css +++ b/agent/ui/resources/custom.css @@ -1,5 +1,5 @@ /* - $Id: custom.css 1302 2006-08-17 15:21:10Z helmutm $ + $Id$ cyberconcepts specialties diff --git a/agent/ui/images/favicon.png b/agent/ui/resources/favicon.png similarity index 100% rename from agent/ui/images/favicon.png rename to agent/ui/resources/favicon.png diff --git a/agent/ui/css/loops.css b/agent/ui/resources/loops.css similarity index 90% rename from agent/ui/css/loops.css rename to agent/ui/resources/loops.css index 5535bbd..c02ba75 100644 --- a/agent/ui/css/loops.css +++ b/agent/ui/resources/loops.css @@ -1,138 +1,138 @@ -/* - $Id: loops.css 1729 2007-05-13 08:56:47Z helmutm $ - - settings specific for view / node objects - -*/ - -a[href]:hover { - text-decoration: none; - color: #803000; -} - -pre { - overflow: scroll; - max-height: 35em; -} - -.box div.body div.even { - background-color: #f4f4f4; -} - -.box { - margin: 12px; -} - -#body { - margin-left: 5px; -} - -/*.content-1 h1 { */ -h1 { - font-size: 160%; - font-weight: bold; -} - -.content-2 h1, h2 { - font-size: 140%; -} - -.content-3 h1, .content-2 h2, h3 { - font-size: 130%; - font-weight: bold; -} - -.content-4 h1, .content-3 h2, .content-2 h3, .content-1 h4 { - font-size: 120%; -} - -.content-5 h1, .content-4 h2, .content-3 h3, content-2 h4 { - font-size: 100%; - border: none; -} - -.subcolumn { - display: inline; - float: left; -} - -.box { - margin: 5px; - padding: 6px; - padding-top: 0; -} - -.box h1, .box h2, .box h3 { - border-bottom: None; -} - -div.menu-1, div.menu-2 { - border-top: 1px solid #eeeeee; - font-weight: bold; -} - -.box div.body div.menu-3 { - border-top: none; - padding-left: 1.5em; -} - -.box div.body div.menu-4 { - padding-left: 3em; - font-size: 90% -} - -.flow-left { - float: left; -} - -.flow-right { - float: right; -} - -div.image { - margin-top: 10px; - margin-right: 5px; -} - - -/* search stuff */ - -.searchForm input.button, input.submit { - padding: 2px; -} - -.searchForm input.submit { - font-weight: bold; -} - -/* dojo stuff */ - -/*.dojoComboBox { - width: 200px; -}*/ - -.dojoDialog { - background: #eee; - border: 1px solid #999; - -moz-border-radius: 5px; - padding: 4px; -} - -.dojoDialog th { - font-size: 120%; - padding: 0 5px 8px 5px; -} - -.dojoDialog .headline { - font-weight: bold; -} - -.dojoDialog input.text { - width: 100%; - margin-right: 10px; -} - -.dojoDialog input.submit { - font-weight: bold; -} - +/* + $Id$ + + settings specific for view / node objects + +*/ + +a[href]:hover { + text-decoration: none; + color: #803000; +} + +pre { + overflow: scroll; + max-height: 35em; +} + +.box div.body div.even { + background-color: #f4f4f4; +} + +.box { + margin: 12px; +} + +#body { + margin-left: 5px; +} + +/*.content-1 h1 { */ +h1 { + font-size: 160%; + font-weight: bold; +} + +.content-2 h1, h2 { + font-size: 140%; +} + +.content-3 h1, .content-2 h2, h3 { + font-size: 130%; + font-weight: bold; +} + +.content-4 h1, .content-3 h2, .content-2 h3, .content-1 h4 { + font-size: 120%; +} + +.content-5 h1, .content-4 h2, .content-3 h3, content-2 h4 { + font-size: 100%; + border: none; +} + +.subcolumn { + display: inline; + float: left; +} + +.box { + margin: 5px; + padding: 6px; + padding-top: 0; +} + +.box h1, .box h2, .box h3 { + border-bottom: None; +} + +div.menu-1, div.menu-2 { + border-top: 1px solid #eeeeee; + font-weight: bold; +} + +.box div.body div.menu-3 { + border-top: none; + padding-left: 1.5em; +} + +.box div.body div.menu-4 { + padding-left: 3em; + font-size: 90% +} + +.flow-left { + float: left; +} + +.flow-right { + float: right; +} + +div.image { + margin-top: 10px; + margin-right: 5px; +} + + +/* search stuff */ + +.searchForm input.button, input.submit { + padding: 2px; +} + +.searchForm input.submit { + font-weight: bold; +} + +/* dojo stuff */ + +/*.dojoComboBox { + width: 200px; +}*/ + +.dojoDialog { + background: #eee; + border: 1px solid #999; + -moz-border-radius: 5px; + padding: 4px; +} + +.dojoDialog th { + font-size: 120%; + padding: 0 5px 8px 5px; +} + +.dojoDialog .headline { + font-weight: bold; +} + +.dojoDialog input.text { + width: 100%; + margin-right: 10px; +} + +.dojoDialog input.submit { + font-weight: bold; +} + diff --git a/agent/ui/images/loops_logo2.png b/agent/ui/resources/loops_logo2.png similarity index 100% rename from agent/ui/images/loops_logo2.png rename to agent/ui/resources/loops_logo2.png diff --git a/agent/ui/css/print.css b/agent/ui/resources/print.css similarity index 70% rename from agent/ui/css/print.css rename to agent/ui/resources/print.css index 6232184..239a028 100644 --- a/agent/ui/css/print.css +++ b/agent/ui/resources/print.css @@ -1,5 +1,5 @@ /* - $Id: print.css 1340 2006-09-12 08:39:40Z helmutm $ + $Id$ */ diff --git a/agent/ui/css/zope3_tablelayout.css b/agent/ui/resources/zope3_tablelayout.css similarity index 100% rename from agent/ui/css/zope3_tablelayout.css rename to agent/ui/resources/zope3_tablelayout.css diff --git a/agent/ui/AgentStart.html b/agent/ui/templates/agent.html similarity index 85% rename from agent/ui/AgentStart.html rename to agent/ui/templates/agent.html index ec9d95d..5f27d9c 100644 --- a/agent/ui/AgentStart.html +++ b/agent/ui/templates/agent.html @@ -1,4 +1,4 @@ - + @@ -8,15 +8,15 @@ loops - + - + - + - + - +