summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2005-11-04 16:55:21 +0000
committerHenri Herscher <henri@oreka.org>2005-11-04 16:55:21 +0000
commitd8b3f44eb74b4947105ff28a1c090854ce8ce238 (patch)
treeb7becf253c697e2a846ec47fab8cb838e0cdcc94
parent1992ecdf8da4b07a409e26e75292c920c4ef7078 (diff)
HTML + icons + CSS cosmetic changes
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@38 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat
-rw-r--r--orkweb/context/WEB-INF/Home.html7
-rw-r--r--orkweb/context/WEB-INF/RecSegments.html34
-rw-r--r--orkweb/context/WEB-INF/RecSegments.page4
-rw-r--r--orkweb/context/css/orekastyle.css247
-rw-r--r--orkweb/src/net/sf/oreka/tapestry/MainMenu.html8
-rw-r--r--orkweb/src/net/sf/oreka/tapestry/TablePaging.html46
-rw-r--r--orkweb/src/net/sf/oreka/tapestry/TablePaging.jwc8
7 files changed, 222 insertions, 132 deletions
diff --git a/orkweb/context/WEB-INF/Home.html b/orkweb/context/WEB-INF/Home.html
index e2ff6d5..4256a96 100644
--- a/orkweb/context/WEB-INF/Home.html
+++ b/orkweb/context/WEB-INF/Home.html
@@ -3,7 +3,7 @@
<body>
-<table id="container">
+<table width="99%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2"><span jwcid="@my:MainMenu" pageName="Home">Here goes the main menu</span></td>
</tr>
@@ -12,6 +12,9 @@
<form jwcid="@Form">
<table class="inputform">
<tr>
+ <td>&nbsp;</td>
+ </tr>
+ <tr>
<td>
<big>Please login<big>
</td>
@@ -32,7 +35,7 @@
<td><input jwcid="@TextField" value="ognl:password" translator="translator:string" hidden="true"/></td>
</tr>
<tr>
- <td><input type="submit" jwcid="@Submit" action="ognl:listeners.formSubmit" value="Login"/></td>
+ <td><input type="submit" id="submitbutton" jwcid="@Submit" action="ognl:listeners.formSubmit" value="Login"/></td>
</tr>
</table>
</form>
diff --git a/orkweb/context/WEB-INF/RecSegments.html b/orkweb/context/WEB-INF/RecSegments.html
index cf4cf42..5c3b91e 100644
--- a/orkweb/context/WEB-INF/RecSegments.html
+++ b/orkweb/context/WEB-INF/RecSegments.html
@@ -1,7 +1,7 @@
<html jwcid="@Shell" stylesheet="ognl:assets.mystyle" title="Browse segments" >
<link jwcid="@If" condition="false" href="orekastyle.css" rel="stylesheet" type="text/css"/>
<body jwcid="@Body">
-<table id="container">
+<table width="99%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2"><span jwcid="@my:MainMenu" pageName="RecSegments">Here goes the main menu</span></td>
</tr>
@@ -9,6 +9,9 @@
<td class="criteria">
<form jwcid="@Form" listener="ognl:listeners.formSubmit">
<table cellpadding="4" class="inputform">
+ <tr>
+ <td>&nbsp;</td>
+ </tr>
<span jwcid="@If" condition="ognl:recSegmentFilter.minDurationError != null">
<tr>
<td class="error"><span jwcid="@Insert" value="ognl:recSegmentFilter.minDurationError">error in this field</span></td>
@@ -59,8 +62,11 @@
</span>
</td>
</tr>
+ <tr>
+ <td>&nbsp;</td>
+ <tr>
<tr align="Left">
- <td colspan="2"><input type="submit" value="Search"/></td>
+ <td colspan="2"><input id="submitbutton" type="submit" value="Search"/></td>
</tr>
<tr>
<td colspan="2">
@@ -112,10 +118,10 @@
<td><span jwcid="@Insert" value="ognl:item.recSegment.timestamp">timestamp</span></td>
<td><span jwcid="@Insert" value="ognl:item.recSegment.duration">duration</span></td>
<td><span jwcid="@Insert" value="ognl:item.recSegment.localParty">local party</span></td>
- <td>
+ <td align="center">
<!--<span jwcid="@Insert" value="ognl:item.recSegment.direction">direction</span>-->
- <span jwcid="@If" condition="ognl:item.recSegment.direction == @net.sf.oreka.Direction@IN">In</span>
- <span jwcid="@If" condition="ognl:item.recSegment.direction == @net.sf.oreka.Direction@OUT">Out</span>
+ <span jwcid="@If" condition="ognl:item.recSegment.direction == @net.sf.oreka.Direction@IN"><img src="images/common/icon_incomingcall.gif" alt="In"></span>
+ <span jwcid="@If" condition="ognl:item.recSegment.direction == @net.sf.oreka.Direction@OUT"><img src="images/common/icon_outgoingcall.gif" alt="Out"></span>
</td>
<td><span jwcid="@Insert" value="ognl:item.recSegment.remoteParty">remote party</span></td>
<td>
@@ -138,6 +144,21 @@
<tr>
<td><span jwcid="mytablepaging2">Paging goes here</span></td>
</tr>
+
+
+ <!--<tr> ### Not sure where to put this
+ <td valign="top">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="7"><img src="images/common/bdr1_results.gif" width="7" height="24"></td>
+ <td class="brd4result">&nbsp;</td>
+ <td width="31"><img src="images/common/bdr4_results.gif" width="23" height="24"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>-->
+
+
</table>
</td>
</span>
@@ -146,9 +167,8 @@
<span key="NoResults">No results</span>
</td>
</span>
+ <td width="15" valign="top" class="brdr6results"><img src="images/common/bdr2_results.gif" width="8" height="8"></td>
</tr>
</table>
-<!--<img jwcid="@Image" image="ognl:assets.myimage" />-->
-
</body>
</html> \ No newline at end of file
diff --git a/orkweb/context/WEB-INF/RecSegments.page b/orkweb/context/WEB-INF/RecSegments.page
index 5894409..96f3e4c 100644
--- a/orkweb/context/WEB-INF/RecSegments.page
+++ b/orkweb/context/WEB-INF/RecSegments.page
@@ -20,8 +20,8 @@
<!--<context-asset name="myimage" path="/images/Czech.gif"/>-->
<external-asset name="mystyle" URL="./css/orekastyle.css" />
- <context-asset name="play" path="/images/icon_play.gif"/>
- <context-asset name="cal" path="/images/icon_calendar.gif"/>
+ <context-asset name="play" path="/images/common/icon_play.gif"/>
+ <context-asset name="cal" path="/images/common/icon_calendar.gif"/>
<bean name="rowStyle" class="org.apache.tapestry.bean.EvenOdd"/>
diff --git a/orkweb/context/css/orekastyle.css b/orkweb/context/css/orekastyle.css
index 343b65c..eb89c9e 100644
--- a/orkweb/context/css/orekastyle.css
+++ b/orkweb/context/css/orekastyle.css
@@ -1,115 +1,220 @@
-body {
- margin: 0; padding: 0;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;}
+body {
+ margin: 0;
+ padding: 0;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ background-color: #FFFFFF;
+ background-image: url(../images/common/bg_page.jpg);
+ background-repeat: repeat-x;
+ background-position: left bottom;
+}
img {border: 0;}
+a:link {text-decoration: none;}
+a:visited {text-decoration: none;}
+
#masthead {padding: 2px;}
-.menuContainer {
+.menu {
font-weight: bold;
- border-bottom: 1px solid #000000;
- border-top: 1px solid #000000;
- background-color: #E6E6E6;
- background-image: url(../images/menuback1.gif);
+ background-image: url(../images/common/bg_header_04.jpg);
background-repeat: repeat-x;
- padding: 0px;
margin: 0px;
+ width: 100%;
+}
+td#menu {
+ padding-top: 1px;
+ padding-bottom: 5px;
+
}
+
.menubuttons {
}
.menubuttons td {
- background-color: #E9E9E9;
text-align: center;
- padding: 2px 8px;
- border: 1px solid #000000;
+ background-image: url(../images/common/bg_btn_off.gif);
+ background-repeat: no-repeat;
+ background-position: left top;
+ width: 80px;
+ height: 25px;
+ vertical-align: middle;
+}
+
+.formbuttons td {
+ text-align: center;
+ background-image: url(../images/common/btn_search_off.gif);
+ background-repeat: no-repeat;
+ background-position: left top;
+ width: 80px;
+ height: 25px;
+ vertical-align: middle;
}
-.menubuttons td.on {
- color: #FFFFFF;
- background-color: #003366;
+.menubuttons a {display: block; width: auto; padding: 2px 8px;}
+.menubuttons a:link {color: #003366; text-decoration: none;}
+.menubuttons a:visited {color: #003366; text-decoration: none;}
+.menubuttons a:hover {color: #CC0000;}
+
+.menubuttons td.on {
text-align: center;
+ background-image: url(../images/common/bg_btn_on.gif);
+ background-repeat: no-repeat;
+ background-position: left top;
+ width: 80px;
+ height: 25px;
+ vertical-align: middle;
}
-.menubuttons td.on a {color: #FFF;}
+.menubuttons td.on a:link {color: #FFF; text-decoration: none;}
+.menubuttons td.on a:visited {color: #FFF; text-decoration: none;}
+.menubuttons td.on a:hover {color: #C00; text-decoration: none;}
+
-.menubuttons a {display: block;}
-.menubuttons a:link {color: #003366;}
-.menubuttons a:visited {color: #003366;}
-.menubuttons a:hover {color:#FFCC00;}
.inputform {
- padding: 0px; width: 350px;
+ width: 345px;
+ padding: 0px;
+ padding-left:10px;
/*border: 1px solid #000000;*/
}
.inputform th {
- text-align: right;
+ text-align: left;
}
.inputform td {
- padding: 4px; font-weight: bold;
-}
-
+ padding: 4px;
+ font-weight: bold;
+ text-align: left;
+}
.inputform input {font-weight: normal;}
+
+.inputform input#submitbutton {
+ font-weight: bold;
+ border-color: #c1dd00;
+ background-color: #ffffff;
+ border-top-width: 2px;
+ border-bottom-width: 2px;
+ border-left-width: 2px;
+ border-right-width: 2px;
+}
+
.error {
font-size: 10px;
font-style: italic;
color: #FF0000;
}
-.cursor {
- background-color: white;
- text-align: right;
- padding-right: 0;
-}
-
-.cursor div {
- border-top: solid 2px #930512;
- background-color: #FD0D24;
- border-bottom: solid 2px #930512;
- text-align: right;
- color: white;
- float: left;
- padding-top: 0;
- height: 1em;
-}
-
-.bar {
- background-color: white;
- text-align: right;
- padding-right: 0;
-}
-
-.bar div {
- border-top: solid 2px #03144B;
- background-color: #0930AC;
- border-bottom: solid 2px #03144B;
- text-align: right;
- color: white;
- float: left;
- padding-top: 0;
- height: 1em;
-}
+
+
table#container {
- border: 1px solid #000000;
+ width:99%;
padding: 0px;
margin: 0px;
- width: 100%;
- background-image:url(../images/bg_container.jpg); background-repeat: repeat-x;
+ border-width:0px;
+ cell-padding:10px;
+
+}
+table#container td {
+ vertical-align: top;
+ padding: 0px;
+ margin: 0px;
+ border-width: 0px;
+}
+td.criteria {
+ width: 360px;
+ background-image: url(../images/common/bg_criterias.gif);
+ background-repeat: no-repeat;
+ background-position: left top;
+ height: 395px;
+ text-align: center;
+ vertical-align: top;
+}
+/*div#criteria {
+ width: 360px;
+ height: 395px;
+ background-attachment: fixed;
+ background-image: url(../images/common/bg_criterias.gif);
+ background-repeat: no-repeat;
+ background-position: left top;
+ position: fixed;
+ top: 120px;
+}*/
+.results {
+ background-attachment: fixed;
+ background-repeat: no-repeat;
+ background-position: left top;
+ background: transparent url(../images/common/bg_results.gif);
}
-table#container td {vertical-align: top;}
-td.criteria {border: 1px solid #000; width: 350px; background-color: #FFF;}
-td.results {border: 1px solid #000; background-color: #FFF;}
+td.brd4result {
+ background-image: url(../images/common/bdr3_results.gif);
+ background-repeat: repeat-x;
+ background-position: left top;
+}
+td.brd5results {
+ background-image: url(../images/common/bdr5_results.gif);
+ background-repeat: repeat-y;
+ background-position: left top;
+}
+td.brdr6results {
+ background-image: url(../images/common/bdr6_results.gif);
+ background-repeat: repeat-y;
+ background-position: left top;
+}
+
+
+
td.results table {width: 100%;}
-tr.header {font-weight: bold; background-color:#333333; color: #fff;}
+tr.header { font-family: Arial, Helvetica, sans-serif; text-transform: uppercase;
+ font-weight: bold; color: #666; background-image:url(../images/common/bg_hdr.gif); background-repeat:repeat-x;}
tr.header td {padding: 4px;}
-tr.header a:link {color: #FFF; text-decoration: none;}
-tr.header a:visited {color: #FFF; text-decoration: none;}
+tr.header a:link {color: #666; text-decoration: none;}
+tr.header a:visited {color: #666; text-decoration: none;}
tr.header a:hover {text-decoration: underline;}
-tr.even {background-color: #EAEAEA;}
-tr.odd {background-color:#E0E0E0;}
+tr.even {background-color: #e4ec87;}
+tr.odd {background-color:#faf8b2;}
+tr.highlight {
+ background-color:#CCE100;
+ color: #FF0000;
+ font-weight: bold;
+}
+
+td.results table.paging, td.results table.paging table {width: auto;}
-td.results table.paging {width: auto;}
.paging tr.odd {background-color:#FFFFFF;}
.paging tr.even {background-color:#FFFFFF;}
+
+
+td.cursor {
+ width: 14px;
+ height: 13px;
+ background-image: url(../images/common/icon_cursor_over.gif);
+ background-repeat: no-repeat;
+ background-position: center center;
+ }
+
+td.bar {
+ width: 16px;
+ height: 16px;
+ background-image: url(../images/common/icon_cursor.gif);
+ background-repeat: no-repeat;
+ background-position: center center;
+}
+
+div#menuContainer2 {
+ height: 36px;
+ width: 99%;
+ border: 0px;
+ margin-left: 10px;
+ margin-top: 10px;
+ margin-bottom: 0px;
+ top: 500px;
+}
+div#main {
+ width: 99%;
+ border: 0px;
+ margin-left: 10px;
+ margin-top: 0px;
+ margin-bottom: 10px;
+}
diff --git a/orkweb/src/net/sf/oreka/tapestry/MainMenu.html b/orkweb/src/net/sf/oreka/tapestry/MainMenu.html
index 8873c57..99a31f0 100644
--- a/orkweb/src/net/sf/oreka/tapestry/MainMenu.html
+++ b/orkweb/src/net/sf/oreka/tapestry/MainMenu.html
@@ -1,8 +1,9 @@
<!-- *** Main Menu *** -->
<link jwcid="@If" condition="false" href="orekastyle.css" rel="stylesheet" type="text/css"/>
-<table width="100%" class="menuContainer">
+<table width="100" border="0" cellpadding="0" cellspacing="0" class="menu">
<tr>
- <td align="left">
+ <td width="20" valign="top"><img src="images/common/bg_header_03.jpg" width="20" height="35"></td>
+ <td align="left" id="menu">
<table class="menubuttons">
<tr>
<td jwcid="@Any" class="ognl:pageName=='Home'? 'on' : ''">
@@ -18,7 +19,7 @@
</tr>
</table>
</td>
- <td align="right">
+ <td align="right" id="menu">
<table class="menubuttons">
<tr>
<td>
@@ -27,5 +28,6 @@
</tr>
</table>
</td>
+ <td width="15" valign="top"><img src="images/common/bg_header_06.jpg" width="15" height="35"></td>
</tr>
</table> \ No newline at end of file
diff --git a/orkweb/src/net/sf/oreka/tapestry/TablePaging.html b/orkweb/src/net/sf/oreka/tapestry/TablePaging.html
index 9adc8d1..2aed178 100644
--- a/orkweb/src/net/sf/oreka/tapestry/TablePaging.html
+++ b/orkweb/src/net/sf/oreka/tapestry/TablePaging.html
@@ -1,43 +1,6 @@
-<!--<style type="text/css">
- .cursor {
- background-color: white;
- text-align: right;
- padding-right: 0;
- }
-
- .cursor div {
- border-top: solid 2px #930512;
- background-color: #FD0D24;
- border-bottom: solid 2px #930512;
- text-align: right;
- color: white;
- float: left;
- padding-top: 0;
- height: 1em;
- }
-
- .bar {
- background-color: white;
- text-align: right;
- padding-right: 0;
- }
-
- .bar div {
- border-top: solid 2px #03144B;
- background-color: #0930AC;
- border-bottom: solid 2px #03144B;
- text-align: right;
- color: white;
- float: left;
- padding-top: 0;
- height: 1em;
-
-
-</style>-->
-
<table width="100%" class="paging">
- <tr class="odd">
- <td align="left">
+ <tr>
+ <td align="center">
<table>
<tr>
<td>
@@ -69,13 +32,10 @@
</tr>
</table>
</td>
- <td width="100%">
- &nbsp;
- </td>
</tr>
<!--*** Slider ***-->
<tr>
- <td colspan="2">
+ <td>
<table width="100%">
<tr>
<td jwcid="@Foreach" source="ognl:sliderPositions" value="ognl:sliderPosition" element="td" class="ognl:tableState.sliderPosition == sliderPosition ? 'cursor' : 'bar'">
diff --git a/orkweb/src/net/sf/oreka/tapestry/TablePaging.jwc b/orkweb/src/net/sf/oreka/tapestry/TablePaging.jwc
index 2e19947..20eb6f2 100644
--- a/orkweb/src/net/sf/oreka/tapestry/TablePaging.jwc
+++ b/orkweb/src/net/sf/oreka/tapestry/TablePaging.jwc
@@ -10,8 +10,8 @@
<property-specification name="sliderPosition" type="java.lang.Integer"/>
- <context-asset name="first" path="/images/icon_pagefirst.gif"/>
- <context-asset name="last" path="/images/icon_pagelast.gif"/>
- <context-asset name="previous" path="/images/icon_pageprev.gif"/>
- <context-asset name="next" path="/images/icon_pagenext.gif"/>
+ <context-asset name="first" path="/images/common/icon_pagefirst.gif"/>
+ <context-asset name="last" path="/images/common/icon_pagelast.gif"/>
+ <context-asset name="previous" path="/images/common/icon_pageprev.gif"/>
+ <context-asset name="next" path="/images/common/icon_pagenext.gif"/>
</component-specification> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 12:43:49 +0000