You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2011/03/28 11:39:42 UTC
svn commit: r1086166 - in
/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources:
CLEREZZA-INF/web-resources/style/ CLEREZZA-INF/web-resources/style/images/bg/
org/apache/clerezza/web/resources/style/
Author: ito
Date: Mon Mar 28 09:39:42 2011
New Revision: 1086166
URL: http://svn.apache.org/viewvc?rev=1086166&view=rev
Log:
CLEREZZA-436: style improved
Added:
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg/fade-menu.png (with props)
Modified:
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/edit.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/form.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/login.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/menu.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/panel.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/window.css
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/edit.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/edit.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/edit.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/edit.css Mon Mar 28 09:39:42 2011
@@ -103,11 +103,19 @@ ul.yui-nav li.selected a:active, ul.yui-
.tx-edit form {
}
+.tx-edit.tx-panel-right form {
+ margin-right: 19em;
+ min-width: 33em;
+}
.tx-edit input, .tx-edit textarea {
width: 22em;
}
+.tx-edit .tx-toplabel input, .tx-edit .tx-toplabel textarea, .tx-edit .tx-toplabel select {
+ width: 31em;
+}
+
.tx-edit select {
width: 22.5em;
}
@@ -138,6 +146,11 @@ ul.yui-nav li.selected a:active, ul.yui-
float: left;
}
+.tx-edit fieldset li.tx-toplabel label {
+ width: 30em;
+ float: none;
+}
+
.tx-edit fieldset li label + p {
margin: 0;
margin-left: 11em;
@@ -148,6 +161,12 @@ ul.yui-nav li.selected a:active, ul.yui-
margin-left: 11em;
}
+.tx-edit fieldset li.tx-toplabel label + div {
+ margin: 0;
+ margin-left: 0em;
+}
+
+
.tx-edit fieldset li a {
text-decoration: none;
}
@@ -163,3 +182,8 @@ ul.yui-nav li.selected a:active, ul.yui-
.tx-edit fieldset li span.tx-item a {
float: right;
}
+
+
+.tx-edit .tx-toplabel .tx-panel-middle input, .tx-edit .tx-toplabel .tx-panel-middle textarea {
+ width: 98%;
+}
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/form.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/form.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/form.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/form.css Mon Mar 28 09:39:42 2011
@@ -6,20 +6,23 @@ form, fieldset {
}
-input, select, textarea, button {
+input, select, textarea, button,
+#tx-panel input, #tx-panel select, #tx-panel textarea, #tx-panel button,
+#tx-header input, #tx-header select, #tx-header textarea, #tx-header button {
margin: 0;
padding: 0.15em 0 0.1em 0.4em;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
}
input.radio {
-
}
input[type="submit"], input[type="file"] {
}
-input[type="radio"], input[type="checkbox"] {
+input[type="radio"], input[type="checkbox"],
+#tx-panel input[type="radio"], #tx-panel input[type="checkbox"],
+#tx-header input[type="radio"], #tx-header input[type="checkbox"] {
margin: auto 0;
padding: 0;
width: 1.4em !important;
@@ -32,7 +35,9 @@ input[type="radio"], input[type="checkbo
}
-input, select, textarea {
+input, select, textarea
+#tx-panel input, #tx-panel select, #tx-panel textarea, #tx-panel input[type='text'], #tx-panel input[type='password'],
+#tx-header input, #tx-header select, #tx-header textarea , #tx-header input[type='text'], #tx-header input[type='password'] {
border-top: solid 1px #a7a7a7;
border-left: solid 1px #a7a7a7;
border-right: solid 1px #a7a7a7;
@@ -43,17 +48,32 @@ input, select, textarea {
min-height: 1.2em;
vertical-align: middle;
font-size: 1.0em;
-
+ outline: none;
}
-select {
+select ,
+#tx-panel select,
+#tx-header select {
padding-left: 0.2em;
}
-textarea {
+textarea,
+#tx-panel textarea,
+#tx-header textarea {
font-size: 1.0em;
padding-right: 0.2em;
}
+textarea:focus, input[type='text']:focus, input[type='password']:focus, select:focus ,
+#tx-panel textarea:focus, #tx-panel input[type='text']:focus, #tx-panel input[type='password']:focus, #tx-panel select:focus ,
+#tx-header textarea:focus, #tx-header input[type='text']:focus, #tx-header input[type='password']:focus, #tx-header select:focus
+{
+ outline: none;
+ border-top: solid 1px #a7a7a7;
+ border-left: solid 1px #a7a7a7;
+ border-right: solid 1px #a7a7a7;
+ border-bottom: solid 1px #cccccc;
+}
+
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css Mon Mar 28 09:39:42 2011
@@ -50,7 +50,7 @@
}
#tx-login {
- width: 50em;
+ width: 16em;
color: #ffffff;
float: right;
padding: 0.2em 0.8em 0 0;
@@ -59,8 +59,8 @@
#tx-login a {
color: #ffffff;
- float: right;
margin-left: 0.8em;
+ margin-right: 0.8em;
}
#tx-login span {
@@ -87,6 +87,19 @@
height: 20px
}
+#tx-header #tx-globalsearch .tx-icon-search {
+ background-color: #FFFFFF;
+ background: url("./images/icons/btn-search.png") no-repeat scroll center center transparent;
+ background-repeat: repeat-x;
+ border-color: #A7A7A7 #A7A7A7 #CCCCCC;
+ border-style: solid;
+ border-width: 1px;
+ font-size: 1em;
+ min-height: 1.2em;
+ outline: medium none;
+ vertical-align: middle;
+}
+
#tx-site {
width: 16em;
color: #ffffff;
Added: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg/fade-menu.png
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg/fade-menu.png?rev=1086166&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg/fade-menu.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/login.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/login.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/login.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/login.css Mon Mar 28 09:39:42 2011
@@ -100,4 +100,4 @@ body {
.tx-line {
border-bottom: 1px solid #E4E4E4;
border-top: none;
-}
+}
\ No newline at end of file
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/menu.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/menu.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/menu.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/menu.css Mon Mar 28 09:39:42 2011
@@ -23,7 +23,7 @@
color: #ffffff;
text-decoration: none;
display: block;
- padding: 0.5em 1.6em 0.6em 0.4em;
+ padding: 0.5em 0.5em 0.6em 0.5em;
}
#tx-menu ol li a:visited, #tx-menu li a:link {
@@ -37,27 +37,30 @@
#tx-menu ol li.active a:visited, #tx-menu ol li.active a:link {
background-color: #ffffff;
color: #333333;
- background-image: url(./images/bg/fade-th-off.png);
+ background-image: url(./images/bg/fade-menu.png);
background-repeat: repeat-x;
}
#tx-menu ol li.active a:active, #tx-menu ol li.active a:hover {
background-color: #ffffff;
color: #333333;
- background-image: url(./images/bg/fade-th-off.png);
+ background-image: url(./images/bg/fade-menu.png);
background-repeat: repeat-x;
}
#tx-menu ol h4 {
border-bottom: solid 1px #dddddd;
margin: 0;
- padding:0;
- font-weight: normal;
+ padding: 0em 0 0.4em 0.4em;
+ font-weight: bold;
color: #000000;
- padding: 1.4em 0 0.4em 0.4em;
clear: both;
}
+#tx-menu ol ol+h4 {
+ padding-top: 1.2em;
+}
+
#tx-menu ol div {
background-color: #ffffff;
border-right: solid 3px #cccccc;
@@ -65,35 +68,58 @@
opacity: 0.9;
display: none;
position: absolute;
- padding: 0.0em 0.4em 0.8em 0.4em;
+ padding: 1.0em 0.6em 0.8em 0.6em;
+ max-width: 15em;
+ min-width: 10em;
+ border-top: solid 1px #ffffff;
+
+ z-index: -1;
+}
+
+#tx-menu ol div.tx-desc {
+ min-width: 30em;
}
#tx-menu ol li li {
- border-bottom: 1px solid #dddddd;
+ border-bottom: 1px solid #c7c7c7;
padding: 0px;
- min: 15em;
+ min-width: 10em;
+ max-width: 15em;
}
+#tx-menu ol li li:last-child, #tx-menu ol li .tx-desc li:last-child{
+ border-bottom: none;
+}
+
+
#tx-menu ol li .tx-desc li {
- border-bottom: 1px solid #dddddd;
+ border-bottom: 1px solid #c7c7c7;
padding: 0px;
- min-width: 35em;
+ min-width: 30em;
}
-#tx-menu ol li li span {
+#tx-menu ol li .tx-desc li span {
display: block;
- width: 20em;
+ width: 16em;
float: left;
color: #555555;
padding: 0.3em 0 0.3em 0em;
}
+#tx-menu ol li li span {
+ display: none;
+}
+
+#tx-menu ol li .tx-desc li a {
+ font-weight: bold;
+}
+
#tx-menu ol li li a {
- color: #333333;
+ color: #455c6a;
display: block;
padding: 0.3em 0 0.3em 0.5em;
width: 13em;
- font-weight: bold;
+ font-weight: normal;
float: left;
}
@@ -114,6 +140,3 @@
background-color: transparent;
}
-#tx-menu2 ol ol {
- display: none;
-}
\ No newline at end of file
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/panel.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/panel.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/panel.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/panel.css Mon Mar 28 09:39:42 2011
@@ -8,6 +8,49 @@
z-Index: 100;
}
+.tx-panel.tx-panel-left {
+ position: absolute;
+ top: 12em;
+ bottom: 0;
+ left: 0.5em;
+ width: 27em;
+ z-Index: 100;
+}
+
+.tx-panel.tx-panel-right {
+ /*
+ position: absolute;
+ top: 0em;
+ right: 0.5em;
+ */
+ position: static;
+ top: auto;
+ right: auto;
+ width: 16em;
+ z-Index: 100;
+ float: right;
+ margin-right: 1em;
+ clear: right;
+ margin-bottom: 1em;
+}
+.tx-panel.tx-panel-middle {
+ /*
+ position: absolute;
+ top: 0em;
+ right: 0.5em;
+ */
+ position: static;
+ top: auto;
+ right: auto;
+ width: 31em;
+ z-Index: 100;
+ float: none;
+ margin-right: 1em;
+ clear: right;
+ margin-bottom: 1em;
+}
+
+
.tx-panel.tx-close {
width: 26px;
overflow: hidden;
@@ -28,7 +71,25 @@
width: 26em;
}
-.tx-panel h3 {
+.tx-panel.tx-panel-right .tx-panel-window {
+ top: auto;
+ bottom: auto;
+ left: auto;
+ width: auto;
+ overflow: visible;
+ position: static;
+}
+
+.tx-panel.tx-panel-middle .tx-panel-window {
+ top: auto;
+ bottom: auto;
+ left: auto;
+ width: auto;
+ overflow: visible;
+ position: static;
+}
+
+.tx-panel h3, .tx-panel div h3 {
background-image: url(./images/bg/fade-panel-search.png);
color: #ffffff;
font-size: 1.0em;
@@ -41,6 +102,22 @@
padding-left: 1em;
}
+.tx-panel.tx-panel-right div h3 {
+ width: 15em;
+ margin: 0 0 0.3em 0px;
+ padding-right: 2px;
+ padding-left: 1em;
+ padding-bottom: 0;
+}
+
+.tx-panel.tx-panel-middle div h3 {
+ width: 30.5em;
+ margin: 0 0 0.3em 0px;
+ padding-right: 2px;
+ padding-left: 1em;
+ padding-bottom: 0;
+}
+
.tx-panel-tabs {
border: solid 1px #bdbdbd;
margin-left: 26px;
@@ -48,6 +125,16 @@
min-height: 98%;
}
+.tx-panel.tx-panel-right .tx-panel-tabs {
+ margin-left: 0px;
+ width: 16em;
+}
+
+.tx-panel.tx-panel-middle .tx-panel-tabs {
+ margin-left: 0px;
+ width: 31.5em;
+}
+
.tx-panel-tabs > div {
padding: 1em;
background-image: url(./images/bg/fade-filter.png);
@@ -98,7 +185,6 @@
margin: 0;
padding: 0;
list-style: none;
-
}
.tx-result > ol > li {
@@ -151,7 +237,7 @@
display: block;
}
-.tx-result ol li lli {
+.tx-result ol li li {
}
.tx-result ol li li a {
@@ -168,6 +254,26 @@
}
+.tx-result li.tx-more {
+ background-image: url(./images/icons/arr-right.png);
+ background-repeat: no-repeat;
+ background-position: 1.8em 0.4em;
+}
+
+.tx-result li.tx-more a {
+ padding-left: 2.9em;
+ color: #1c6d8b;
+}
+
+.tx-result li.tx-more a:visited, .tx-result li.tx-more a:link {
+ color: #1c6d8b;
+}
+
+.tx-result li.tx-more a:active, .tx-result li.tx-more a:hover {
+ color: #1c6d8b;
+ text-decoration: underline;
+}
+
/* filter (in panel)*/
.tx-panel .tx-filter {
@@ -218,9 +324,11 @@
/* tabs */
.tx-panel .tx-panel-tab-buttons {
+
background-color: #dadada;
background-image: url(./images/panel/bg-tab.png);
background-repeat: repeat-y;
+
min-height: 98%;
float: left;
width: 26px;
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/style.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/style.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/style.css Mon Mar 28 09:39:42 2011
@@ -7,6 +7,7 @@
@import "button.css";
@import "form.css";
+
@import "list.css";
@import "table.css";
@import "edit.css";
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/window.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/window.css?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/window.css (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/window.css Mon Mar 28 09:39:42 2011
@@ -111,3 +111,60 @@
font-size: 1.3em;
}
+ol.tx-columns-overlay {
+ width: 31%;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ float: left;
+ margin-right: 3%;
+ padding-top: 1em;
+}
+
+ol.tx-columns-overlay.tx-col2 {
+ width: 48%;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ float: left;
+ margin-right: 3%;
+ padding-top: 1em;
+}
+
+ol.tx-columns-overlay.tx-last {
+ margin-right: 0;
+}
+
+ol.tx-columns-overlay li {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ font-weight: bold;
+ color: #666666;
+}
+
+ol.tx-columns-overlay li:first-child {
+ border-top: solid 1px #e4e4e4;
+}
+
+
+ol.tx-columns-overlay ol {
+ width: auto;
+ float: none;
+ margin: 0;
+ padding: 0;
+}
+
+ol.tx-columns-overlay li li {
+ border-bottom: solid 1px #e4e4e4;
+ border-top: none;
+ font-weight: normal;
+}
+
+ol.tx-columns-overlay li li:first-child {
+ border-bottom: solid 1px #e4e4e4;
+ border-top: solid 1px #e4e4e4;
+ font-weight: normal;
+}
+
+
Modified: incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=1086166&r1=1086165&r2=1086166&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp (original)
+++ incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp Mon Mar 28 09:39:42 2011
@@ -1,6 +1,7 @@
def menu(s: Any) = new UriRef("http://clerezza.org/2009/11/global-menu#"+s)
def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#"+s)
def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
+def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
resultDocModifier.addScriptReference("/style/scripts/login.js");
@@ -13,16 +14,15 @@ resultDocModifier.addScriptReference("/s
</form>
</div>
-
<div id="tx-login">
- {if((context/platform("user")/platform("userName")*).equals("anonymous")) {
+ {
+ val username = (context/platform("user")/platform("userName")*)
+ if((username).equals("anonymous")) {
<span>
<a href="#" id="tx-login-button">login</a>
</span>
} else {
- <span>{context/platform("user")/platform("userName")*}
- <a href="/logout">logout</a>
- </span>
+ <span><a href={"/user/" + username + "/control-panel"}>{username}</a>|<a href="/logout">logout</a></span>
}
}
</div>
@@ -43,11 +43,11 @@ resultDocModifier.addScriptReference("/s
{
ifx ((menuItem/menu("children")).length > 0) {
<div>
- <h4></h4>
<ol>
{
- for (childMenuItem <- menuItem/menu("children")!!) yield
- <li class="clearfix"><a href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a><span></span></li>
+ for (childMenuItem <- menuItem/menu("children")!!) yield {
+ <li class="clearfix"><a href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a><span>{childMenuItem/dct("description")*}</span></li>
+ }
}
</ol>
</div>