You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ma...@apache.org on 2004/11/05 05:25:17 UTC
cvs commit: jakarta-slide/projector/src/content/applications/core/templates/style stylesheet.tmpl
masonjm 2004/11/04 20:25:17
Modified: projector/src/content/applications/admin/templates
sideMenu.tmpl triggerColumn.tmpl
projector/src/content/applications/admin/site listRoles.xml
editUser.xml listUsers.xml
projector/src/content/applications/core/templates/table
defaultTable.tmpl
projector/src/content/applications/admin/i18n sitemap.xml
projector/src/content/applications/core/style style.xml
projector/src/content/applications/core/templates/style
stylesheet.tmpl
Added: projector/src/content/applications/admin/images
crystal_group_list.png crystal_tab_right.png
crystal_group_add.png crystal_descending.png
crystal_ascending.png cancel.png apply.png
crystal_user_add.png crystal_user_list.png
crystal_tab_left.png crystal_group.png
crystal_user.png crystal_delete.png
Log:
Facelift for example appliction. Uses Crystal SVG icon set.
Revision Changes Path
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_group_list.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_tab_right.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_group_add.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_descending.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_ascending.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/cancel.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/apply.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_user_add.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_user_list.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_tab_left.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_group.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_user.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/crystal_delete.png
<<Binary file>>
1.2 +4 -4 jakarta-slide/projector/src/content/applications/admin/templates/sideMenu.tmpl
Index: sideMenu.tmpl
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/templates/sideMenu.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sideMenu.tmpl 22 Jul 2004 12:18:37 -0000 1.1
+++ sideMenu.tmpl 5 Nov 2004 04:25:17 -0000 1.2
@@ -3,18 +3,18 @@
<!-- First level (level 0) -->
<!--*** Start of 'header 0' ***-->
-<table>
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
<!--*** End of 'header 0' ***-->
<!--*** Start of 'default 0' ***-->
<tr class="unselectedMenuItem0">
-<td><a href="<%id%>"><img src="<%icon%>"/></a><br/><%title%></a></td><td><%description;optional%></td>
+<td><a href="<%id%>"><img src="<%icon%>" alt="<%title%>" title="<%title%>" /><%title%></a></td><td><%description;optional%></td>
</tr>
<!--*** End of 'default 0' ***-->
<!--*** Start of 'active 0' ***-->
-<tr class="unselectedMenuItem0">
-<td><a href="<%id%>"><img src="<%icon%>"/></a><br/><%title%></a></td><td><%description;optional%></td>
+<tr class="selectedMenuItem0">
+<td valign="middle"><a href="<%id%>"><img src="<%icon%>" alt="<%title%>" title="<%title%>" /><%title%></a></td><td><%description;optional%></td>
</tr>
<!--*** End of 'active 0' ***-->
1.2 +1 -1 jakarta-slide/projector/src/content/applications/admin/templates/triggerColumn.tmpl
Index: triggerColumn.tmpl
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/templates/triggerColumn.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- triggerColumn.tmpl 22 Jul 2004 12:18:37 -0000 1.1
+++ triggerColumn.tmpl 5 Nov 2004 04:25:17 -0000 1.2
@@ -1 +1 @@
-<td <?style style="<%style%>"?>><a href="<%target%>?uri=<%value%>"><img src="<%src%>"/></a></td>
\ No newline at end of file
+<td <?style style="<%style%>"?>><a href="<%target%>?uri=<%value%>"><img src="<%src%>" alt="<%title;optional%>" title="<%title;optional%>" /></a></td>
\ No newline at end of file
1.4 +2 -2 jakarta-slide/projector/src/content/applications/admin/site/listRoles.xml
Index: listRoles.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/site/listRoles.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- listRoles.xml 30 Sep 2004 19:26:17 -0000 1.3
+++ listRoles.xml 5 Nov 2004 04:25:17 -0000 1.4
@@ -41,7 +41,7 @@
<entry key="processor"><string>table/column/image</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/user-sibling.gif</string></value></entry>
+ <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_group.png</string></value></entry>
<entry key="style"><string>width: 24px;</string></entry>
</map>
</entry>
@@ -77,7 +77,7 @@
<entry key="processor"><string>admin/table/column/trigger</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/delete-user.png</string></value></entry>
+ <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_delete.png</string></value></entry>
<entry key="target"><value processor="url"><string>admin/deleteRole</string></value></entry>
<entry key="style"><string>width: 24px;</string></entry>
</map>
1.5 +4 -4 jakarta-slide/projector/src/content/applications/admin/site/editUser.xml
Index: editUser.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/site/editUser.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- editUser.xml 30 Sep 2004 19:26:17 -0000 1.4
+++ editUser.xml 5 Nov 2004 04:25:17 -0000 1.5
@@ -40,8 +40,8 @@
<load parameter="principal-header"><value processor="message"><string>membership</string></value></load>
<load parameter="creation-header"><string>Creation date</string></load>
<load parameter="user"><value store="input" key="uri"/></load>
- <load parameter="principal-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/role.gif</string></value></load>
- <load parameter="delete-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/delete-role.png</string></value></load>
+ <load parameter="principal-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_group.png</string></value></load>
+ <load parameter="delete-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_delete.png</string></value></load>
<load parameter="delete-processor"><value processor="url"><string>admin/removeRole</string></value></load>
<load parameter="input"><value key="roles" /></load>
<load parameter="offset"><string>0</string></load>
@@ -81,8 +81,8 @@
<step id="renderRoles" processor="addMembershipTable">
<load parameter="principal-header"><value processor="message"><string>availableRoles</string></value></load>
<load parameter="user"><value store="input" key="uri"/></load>
- <load parameter="principal-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/role.gif</string></value></load>
- <load parameter="processor-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/add_group.gif</string></value></load>
+ <load parameter="principal-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_group.png</string></value></load>
+ <load parameter="processor-icon"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_delete.png</string></value></load>
<load parameter="add-processor"><value processor="url"><string>admin/addRole</string></value></load>
<load parameter="input"><value key="roles" /></load>
<load parameter="offset"><string>0</string></load>
1.6 +4 -2 jakarta-slide/projector/src/content/applications/admin/site/listUsers.xml
Index: listUsers.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/site/listUsers.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- listUsers.xml 30 Sep 2004 19:26:17 -0000 1.5
+++ listUsers.xml 5 Nov 2004 04:25:17 -0000 1.6
@@ -41,9 +41,10 @@
<entry key="processor"><string>admin/table/column/trigger</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/user-small.gif</string></value></entry>
+ <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_user.png</string></value></entry>
<entry key="target"><value processor="url"><string>editUser.html</string></value></entry>
<entry key="style"><string>height: 24px; width: 24px;</string></entry>
+ <entry key="title"><string>View User</string></entry>
</map>
</entry>
<entry key="result"><string>output</string></entry>
@@ -78,9 +79,10 @@
<entry key="processor"><string>admin/table/column/trigger</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/user-remove.gif</string></value></entry>
+ <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/crystal_delete.png</string></value></entry>
<entry key="target"><value processor="url"><string>admin/deleteUser</string></value></entry>
<entry key="style"><string>width: 24px;</string></entry>
+ <entry key="title"><string>Delete User</string></entry>
</map>
</entry>
<entry key="result"><string>output</string></entry>
1.2 +4 -4 jakarta-slide/projector/src/content/applications/core/templates/table/defaultTable.tmpl
Index: defaultTable.tmpl
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/core/templates/table/defaultTable.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- defaultTable.tmpl 22 Jul 2004 12:18:38 -0000 1.1
+++ defaultTable.tmpl 5 Nov 2004 04:25:17 -0000 1.2
@@ -1,15 +1,15 @@
<!-- Header and column fragments -->
<!--*** Start of 'header column' ***-->
-<th <?style style="<%style%>"?>><%header;optional%> <?sortableHandler <a href="<%sortableHandler;optional%>">(?)</a>?><?resizableHandler <a href="<%resizableHandler;optional%>">(C)</a>?></th>
+<th <?style style="<%style%>"?>><%header;optional%> <?sortableHandler <a href="<%sortableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_descending.png" alt="Sort descending" title="Sort descending"/></a>?><?resizableHandler <a href="<%resizableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_right.png" alt="Collapse column" title="Collapse column"/><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_left.png" alt="Collapse column" title="Collapse column"/></a>?></th>
<!--*** End of 'header column' ***-->
<!--*** Start of 'descending header column' ***-->
-<th><%header;optional%> <a href="<%sortableHandler;optional%>">down</a><?resizableHandler <a href="<%resizableHandler;optional%>">(C)</a>?></th>
+<th><%header;optional%> <a href="<%sortableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_ascending.png" alt="Sort descending" title="Sort descending"/></a><?resizableHandler <a href="<%resizableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_right.png" alt="Collapse column" title="Collapse column"/><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_left.png" alt="Collapse column" title="Collapse column"/></a>?></th>
<!--*** End of 'descending header column' ***-->
<!--*** Start of 'ascending header column' ***-->
-<th><%header;optional%> <a href="<%sortableHandler;optional%>">up</a><?resizableHandler <a href="<%resizableHandler;optional%>">(C)</a>?></th>
+<th><%header;optional%> <a href="<%sortableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_descending.png" alt="Sort ascending" title="Sort ascending"/></a><?resizableHandler <a href="<%resizableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_right.png" alt="Collapse column" title="Collapse column"/><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_left.png" alt="Collapse column" title="Collapse column"/></a>?></th>
<!--*** End of 'ascending header column' ***-->
<!--*** Start of 'collapsed header column' ***-->
-<th width="24"><a href="<%resizableHandler;optional%>">(EX)</a></th>
+<th width="32"><a href="<%resizableHandler;optional%>"><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_left.png" alt="Expand column" title="Expand column"/><img src="/projector/image?input=/projector/applications/admin/images/crystal_tab_right.png" alt="Expand column" title="Expand column"/></a></th>
<!--*** End of 'collapsed header column' ***-->
<!--*** Start of 'column' ***-->
1.3 +8 -8 jakarta-slide/projector/src/content/applications/admin/i18n/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/i18n/sitemap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xml 11 Aug 2004 13:13:04 -0000 1.2
+++ sitemap.xml 5 Nov 2004 04:25:17 -0000 1.3
@@ -3,41 +3,41 @@
<message id="listUsers.html">
<locale language="de">
<entry key="title">Benutzer anzeigen</entry>
- <entry key="image:icon">/projector/applications/admin/images/user-small.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_user_list.png</entry>
</locale>
<locale language="en">
<entry key="title">List users</entry>
- <entry key="image:icon">/projector/applications/admin/images/user-small.gif.jpg</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_user_list.png</entry>
</locale>
</message>
<message id="listRoles.html">
<locale language="de">
<entry key="title">Rollen anzeigen</entry>
- <entry key="image:icon">/projector/applications/admin/images/user-sibling.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_group_list.png</entry>
</locale>
<locale language="en">
<entry key="title">List roles</entry>
- <entry key="image:icon">/projector/applications/admin/images/user-sibling.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_group_list.png</entry>
</locale>
</message>
<message id="createUser.html">
<locale language="de">
<entry key="title">Benutzer anlegen</entry>
- <entry key="image:icon">/projector/applications/admin/images/user_role-add.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_user_add.png</entry>
</locale>
<locale language="en">
<entry key="title">Create user</entry>
- <entry key="image:icon">/projector/applications/admin/images/user_role-add.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_user_add.png</entry>
</locale>
</message>
<message id="createRole.html">
<locale language="de">
<entry key="title">Rolle anlegen</entry>
- <entry key="image:icon">/projector/applications/admin/images/user_role2-add.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_group_add.png</entry>
</locale>
<locale language="en">
<entry key="title">Create role</entry>
- <entry key="image:icon">/projector/applications/admin/images/user_role2-add.gif</entry>
+ <entry key="image:icon">/projector/applications/admin/images/crystal_group_add.png</entry>
</locale>
</message>
</messages>
1.4 +8 -5 jakarta-slide/projector/src/content/applications/core/style/style.xml
Index: style.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/core/style/style.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- style.xml 30 Sep 2004 19:26:31 -0000 1.3
+++ style.xml 5 Nov 2004 04:25:17 -0000 1.4
@@ -15,11 +15,14 @@
</description>
<step id="compose" processor="stylesheetTemplate">
- <load parameter="veryDark"><string>#553E1C </string></load>
- <load parameter="dark"><string>#AA7D39</string></load>
- <load parameter="medium"><string>#FF9900</string></load>
- <load parameter="light"><string>#FFCC80</string></load>
- <load parameter="veryLight"><string>#FFE6BF</string></load>
+ <load parameter="veryDark"><string>#082C7B</string></load>
+ <load parameter="dark"><string>#18AA00</string></load>
+ <load parameter="medium"><string>#6AAEEE</string></load>
+ <load parameter="light"><string>#BDE6FF</string></load>
+ <load parameter="veryLight"><string>#F6FAFF</string></load>
+
+ <load parameter="accentSelectedBackground"><string>#A4DE9C</string></load>
+
<route state="ok" return="ok">
<save result="output" store="output" key="output" />
</route>
1.2 +42 -11 jakarta-slide/projector/src/content/applications/core/templates/style/stylesheet.tmpl
Index: stylesheet.tmpl
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/core/templates/style/stylesheet.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stylesheet.tmpl 22 Jul 2004 12:18:39 -0000 1.1
+++ stylesheet.tmpl 5 Nov 2004 04:25:17 -0000 1.2
@@ -37,7 +37,7 @@
}
.form-description {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
padding: 5px;
}
@@ -48,14 +48,14 @@
}
.error-number {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
color: red;
text-decoration: none;
font-size: x-small;
}
.control-title {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
font-weight: bold;
padding: 5px;
background-color: white;
@@ -67,7 +67,7 @@
}
.invalid-control-title {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
font-weight: bold;
color: red;
padding: 5px;
@@ -80,7 +80,7 @@
}
.error-description {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
font-size: small;
padding: 5px;
background-color: white;
@@ -101,7 +101,7 @@
}
.control-description {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
font-size: small;
width: 250px;
padding: 5px;
@@ -113,7 +113,7 @@
}
.control-prompt {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
padding: 5px;
background-color: white;
border-width: 1px;
@@ -123,7 +123,7 @@
}
.control-prompt-border {
- font-family: sans-seric,cursive;
+ font-family: sans-serif,cursive;
padding: 5px;
background-color: white;
border-width: 1px;
@@ -171,11 +171,15 @@
background-color: <%veryLight%>;
margin: 0px;
border: 0px;
+ font-family: sans-serif;
}
-h1 { color:white; font-size:36pt; }
+h1 {
+ color: <%veryLight%>;
+ font-size: 20pt;
+}
-a > img {
+a img {
border: 0px;
}
@@ -248,7 +252,7 @@
}
td.header-row {
- height: 100px;
+ padding: .2em .7em;
background-color: <%medium%>;
}
@@ -267,4 +271,31 @@
width: 200px;
background-color: <%light%>;
vertical-align: top;
+}
+
+/* sideMenu */
+.selectedMenuItem0, .unselectedMenuItem0 {
+ height: 2.5em;
+}
+
+.selectedMenuItem0 td, .unselectedMenuItem0 td {
+ position: relative;
+ padding-left: 36px;
+}
+
+.selectedMenuItem0 td a, .unselectedMenuItem0 td a {
+ position: relative;
+}
+
+.selectedMenuItem0 img, .unselectedMenuItem0 img {
+ position: absolute;
+ left: -34px;
+ top: -6px;
+}
+
+.selectedMenuItem0 {
+ background-color: <%accentSelectedBackground%>;
+}
+
+.unselectedMenuItem0 {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org