You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/11/21 01:35:15 UTC
svn commit: r1411963 - in
/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui:
components/collectioncontents/ajaxtable/ components/widgets/cssmenu/ pages/
selector/links/ selector/links/images/
Author: danhaywood
Date: Wed Nov 21 00:35:13 2012
New Revision: 1411963
URL: http://svn.apache.org/viewvc?rev=1411963&view=rev
Log:
UI Updates
Added:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_off.png
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_on.png
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css?rev=1411963&r1=1411962&r2=1411963&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css Wed Nov 21 00:35:13 2012
@@ -99,16 +99,31 @@
float: right;
}
-.collectionContentsAsAjaxTablePanel table.contents .navigator .first,
-.collectionContentsAsAjaxTablePanel table.contents .navigator .prev,
-.collectionContentsAsAjaxTablePanel table.contents .navigator .next,
-.collectionContentsAsAjaxTablePanel table.contents .navigator .last,
-.collectionContentsAsAjaxTablePanel table.contents .navigator .goto {
- margin-left: 0.5em;
+.collectionContentsAsAjaxTablePanel table.contents .navigator a.first,
+.collectionContentsAsAjaxTablePanel table.contents .navigator a.prev,
+.collectionContentsAsAjaxTablePanel table.contents .navigator a.next,
+.collectionContentsAsAjaxTablePanel table.contents .navigator a.last,
+.collectionContentsAsAjaxTablePanel table.contents .navigator .goto a,
+.collectionContentsAsAjaxTablePanel table.contents .navigator .goto em,
+.collectionContentsAsAjaxTablePanel table.contents .navigator .first em,
+.collectionContentsAsAjaxTablePanel table.contents .navigator .prev em,
+.collectionContentsAsAjaxTablePanel table.contents .navigator .next em,
+.collectionContentsAsAjaxTablePanel table.contents .navigator .last em {
+ margin-left: 5px;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ background-color:#F0EFEA;
+ width:20px;
+ height:20px;
+ line-height:20px;
+ float:left;
+ text-align:center;
}
.collectionContentsAsAjaxTablePanel table.contents .navigator .goto em {
- background-color: #DDD;
+ background-color: #20B5C2;
+ color:#FFFFFF;
}
.collectionContentsAsAjaxTablePanel table.contents a {
@@ -124,3 +139,12 @@
vertical-align:text-bottom;
padding-right:6px;
}
+
+.collectionContentsAsAjaxTablePanel table tfoot {
+ margin-top:20px;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot tr td {
+ padding:20px 4px 0px;
+ background-color:#FFFFFF !important;
+}
\ No newline at end of file
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css?rev=1411963&r1=1411962&r2=1411963&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css Wed Nov 21 00:35:13 2012
@@ -266,4 +266,32 @@
.additionalLinkList {
float:right;
-}
\ No newline at end of file
+ margin:0px;
+ padding:0px;
+ list-style:none;
+}
+
+ .additionalLinkList li {
+ float:left;
+ margin-right:10px;
+ }
+
+ .additionalLinkList li a {
+ background-color: #F0EFEA;
+ border-radius: 4px 4px 4px 4px;
+ color: #46423C;
+ display: block;
+ float: left;
+ font-size: 0.85em;
+ font-weight: bold;
+ height: 30px;
+ line-height: 30px;
+ padding: 0 10px;
+ text-decoration: none;
+ text-transform: uppercase;
+ }
+
+ .additionalLinkList li a:hover {
+ background-color:#20B5C2;
+ color:#FFFFFF;
+ }
\ No newline at end of file
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1411963&r1=1411962&r2=1411963&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Wed Nov 21 00:35:13 2012
@@ -472,9 +472,11 @@ tr.section td {
color:#46413B;
}
-.scalarName:after, .collectionName:after {
- content: ":";
- font-style: normal;
+.mandatory .scalarName:after,
+.mandatory .collectionName:after {
+ content: " *";
+ font-weight:bold;
+ color:#20B5C2;
}
.scalarValue,.collectionContents {
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css?rev=1411963&r1=1411962&r2=1411963&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css Wed Nov 21 00:35:13 2012
@@ -62,6 +62,44 @@ span.ViewLinkItem {
height:30px;
line-height:30px;
font-style:normal;
+ width:12px;
+ text-indent:-999em;
+}
+
+span.ViewLinkItem.hide {
+ background-image:url('images/icon_hide_on.png');
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+a span.ViewLinkItem.calendar {
+ background-image:url('images/icon_calendar_off.png');
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+span.ViewLinkItem.table {
+ background-image:url('images/icon_table_on.png');
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+a span.ViewLinkItem.hide {
+ background-image:url('images/icon_hide_off.png');
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+span.ViewLinkItem.calendar {
+ background-image:url('images/icon_calendar_on.png');
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+a span.ViewLinkItem.table {
+ background-image:url('images/icon_table_off.png');
+ background-position: center center;
+ background-repeat:no-repeat;
}
.ViewLinkItem {
Added: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_off.png
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_off.png?rev=1411963&view=auto
==============================================================================
Files isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_off.png (added) and isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_off.png Wed Nov 21 00:35:13 2012 differ
Added: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_on.png
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_on.png?rev=1411963&view=auto
==============================================================================
Files isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_on.png (added) and isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_calendar_on.png Wed Nov 21 00:35:13 2012 differ
Added: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png?rev=1411963&view=auto
==============================================================================
Files isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png (added) and isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png Wed Nov 21 00:35:13 2012 differ
Added: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png?rev=1411963&view=auto
==============================================================================
Files isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png (added) and isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png Wed Nov 21 00:35:13 2012 differ
Added: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png?rev=1411963&view=auto
==============================================================================
Files isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png (added) and isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png Wed Nov 21 00:35:13 2012 differ
Added: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png?rev=1411963&view=auto
==============================================================================
Files isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png (added) and isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png Wed Nov 21 00:35:13 2012 differ