Binary file web/data/button.png has changed
--- a/web/data/cubicweb.acl.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.acl.css Mon Jun 21 16:13:41 2010 +0200
@@ -6,78 +6,35 @@
*/
/******************************************************************************/
-/* security edition form (views/management.py) */
+/* security edition form (views/management.py) web/views/schema.py */
/******************************************************************************/
h2.schema{
- background : #ff7700;
- color: #fff;
- font-weight: bold;
- padding : 0.1em 0.3em;
+ color: %(aColor)s;
}
-
-h3.schema{
+table.schemaInfo td a.users{
+ color : #00CC33;
font-weight: bold;
}
-h4 a,
-h4 a:link,
-h4 a:visited{
- color:#000;
- }
-
-table.schemaInfo {
- margin: 1em 0em;
- text-align: left;
- border: 1px solid black;
- border-collapse: collapse;
- width:100%;
-}
-
-table.schemaInfo th,
-table.schemaInfo td {
- padding: .3em .5em;
- border: 1px solid grey;
- width:33%;
-}
-
-
-table.schemaInfo tr th {
- padding: 0.2em 0px 0.2em 5px;
- background-image:none;
- background-color:#dfdfdf;
-}
-
-table.schemaInfo thead tr {
- border: 1px solid #dfdfdf;
-}
-
-table.schemaInfo td {
- padding: 3px 10px 3px 5px;
-
-}
-
-a.users{
- color : #00CC33;
- font-weight: bold }
-
-a.guests{
- color : #ff7700;
+table.schemaInfo td a.guests{
+ color: #ff7700;
font-weight: bold;
}
-a.owners{
- color : #8b0000;
+table.schemaInfo td a.owners{
+ color: #8b0000;
font-weight: bold;
}
-a.managers{
+table.schemaInfo td a.managers{
color: #000000;
+ font-weight: bold;
}
.discret,
-a.grey{
+table.schemaInfo td a.grey{
color:#666;
}
@@ -86,39 +43,9 @@
}
.red{
- color : #ff7700;
+ color: #ff7700;
}
div#schema_security{
width:100%;
- }
-/******************************************************************************/
-/* user groups edition form (views/euser.py) */
-/******************************************************************************/
-
-table#groupedit {
- margin: 1ex 1em;
- text-align: left;
- border: 1px solid black;
- border-collapse: collapse;
-}
-
-table#groupedit th,
-table#groupedit td {
- padding: 0.5em 1em;
-}
-
-table#groupedit tr {
- border-bottom: 1px solid black;
-}
-
-table#groupedit tr.nogroup {
- border: 1px solid red;
- margin: 1px;
-}
-
-table#groupedit td {
- text-align: center;
- padding: 0.5em;
-}
-
+ }
\ No newline at end of file
--- a/web/data/cubicweb.calendar.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.calendar.css Mon Jun 21 16:13:41 2010 +0200
@@ -230,7 +230,7 @@
.calendar th.month {
font-weight:bold;
padding-bottom:0.2em;
- background: #cfceb7;
+ background: %(actionBoxTitleBgColor)s;
}
.calendar th.month a{
--- a/web/data/cubicweb.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.css Mon Jun 21 16:13:41 2010 +0200
@@ -10,7 +10,7 @@
/* scale and rhythm cf http://lamb.cc/typograph/ */
body {
- font-family: %(defaultFont)s;
+ font-family: %(defaultFontFamily)s;
font-size: %(defaultSize)s;
line-height: %(defaultLineHeight)s;
color: %(defaultColor)s;
@@ -37,10 +37,16 @@
/* paddings */
h1 {
- border-bottom: %(h1BorderBottomStyle)s;
- padding: %(h1Padding)s;
- margin: %(h1Margin)s;
+ border-bottom: %(h1BorderBottomStyle)s;
+ padding: %(h1Padding)s;
+ margin: %(h1Margin)s;
+ color: %(h1Color)s;
}
+
+h1.plain {
+ border-bottom: none;
+}
+
h2 { padding: %(h2Padding)s; }
h3 { padding: %(h3Padding)s; }
@@ -73,10 +79,10 @@
clear: both;
font-family: 'Courier New', monospace;
letter-spacing: 0.015em;
- padding: 0.5em;
- margin: 0 1.5em 1.5em;
- background-color: #f0f0f0;
- border: 1px solid #ccbca7;
+ padding: 0.6em;
+ margin: 0 2em 1.7em;
+ background-color: %(listingHihligthedBgColor)s;
+ border: 1px solid %(listingBorderColor)s;
}
p {
@@ -84,9 +90,13 @@
margin-bottom: %(defaultLineHeightEm)s;
}
-ol, ul {
- list-style-type: disc;
- margin-bottom: %(defaultLineHeightEm)s;
+ul {
+ margin-bottom: %(defaultLineHeightEm)s;
+}
+
+ol {
+ list-style-type: decimal;
+ /* margin-bottom: %(defaultLineHeightEm)s; */
}
ol ol,
@@ -95,14 +105,23 @@
margin-bottom : 0px;
}
-p + ul {
- margin-top: -%(defaultLineHeightEm)s;
-}
+/* p + ul { */
+/* margin-top: -%(defaultLineHeightEm)s; */
+/* } */
li {
margin-left: 1.5em;
}
+img{
+ border: none;
+}
+
+fieldset {
+ border: none;
+}
+
+h1 a, h1 a:active, h1 a:visited, h1 a:link,
h2 a, h2 a:active, h2 a:visited, h2 a:link,
h3 a, h3 a:active, h3 a:visited, h3 a:link {
color: inherit;
@@ -110,19 +129,30 @@
}
input, textarea {
+ padding: 0.1em 0.2em;
+ vertical-align: bottom;
border: 1px solid %(pageContentBorderColor)s;
- padding: 0.1em;
- vertical-align: middle;
+
}
input:focus {
border: 1px inset %(headerBgColor)s;
}
+hr{
+ border: none;
+ border-bottom: 1px solid %(defaultColor)s;
+ height: 1px;
+}
+
/***************************************/
/* generic classes */
/***************************************/
+h1 a:hover {
+ text-decoration: none;
+}
+
.odd {
background-color: #f7f6f1;
}
@@ -136,6 +166,12 @@
height: 17px;
}
+hr.boxSeparator{
+ border: none;
+ border-bottom: 1px solid %(listingBorderColor)s;
+ height: 1px;
+}
+
.left {
float: left;
}
@@ -154,7 +190,6 @@
}
li.invisible {
- list-style: none;
background: none;
padding: 0px 0px 1px 1px;
}
@@ -170,7 +205,7 @@
/* header */
table#header {
- background: %(headerBgColor)s url("banner.png") left top repeat-x;
+ background: %(headerBgColor)s url("banner.png") repeat-x top left;
text-align: left;
}
@@ -197,15 +232,20 @@
}
/* Popup on login box and userActionBox */
-div.popupWrapper{
- position:relative;
- z-index:100;
+div.popupWrapper {
+ position: relative;
+ z-index: 100;
}
div.popup {
position: absolute;
background: #fff;
- border: 1px solid #fff;
+ /* background-color: #f0eff0; */
+ /* background-image: url(popup.png); */
+ /* background-repeat: repeat-x; */
+ /* background-positon: top left; */
+ border: 1px solid %(listingBorderColor)s;
+ border-top: none;
text-align: left;
z-index: 400;
}
@@ -215,15 +255,9 @@
color: #000;
}
-/* FIXME appear with 4px width in IE6 */
-div#stateheader{
- min-width: 66%;
-}
-
/* main zone */
div#page {
- min-height: %(pageMinHeight)s;
margin: %(defaultLayoutMargin)s;
}
@@ -239,15 +273,22 @@
div#pageContent {
clear: both;
-/* margin-top:-1px; /* enable when testing rhythm */
+ /* margin-top:-1px; *//* enable when testing rhythm */
background: %(pageContentBgColor)s;
border: 1px solid %(pageContentBorderColor)s;
- padding: 0px %(pageContentPadding)s %(pageContentPadding)s;
+ padding: 0 %(pageContentPadding)s %(pageContentPadding)s;
+}
+
+div#pageContent #contentmain .pagination {
+ margin-top: 0;
}
+div#pageContent .pagination{
+ margin-top: 1.5em;
+}
-div#breadcrumbs {
- padding: %(pageContentPadding)s 0 0 0;
+div#contentmain{
+ margin-top: %(pageContentPadding)s
}
/*FIXME */
@@ -263,14 +304,12 @@
/* rql bar */
div#rqlinput {
- margin-bottom: 8px;
- padding: 3px;
- background: %(actionBoxTitleBgColor)s;
- border: 1px solid %(actionBoxTitleBgColor)s;
+ margin-bottom: %(defaultLayoutMargin)s;
}
input#rql{
- width: 95%;
+ padding: 0.25em 0.3em;
+ width: 99%;
}
/* boxes */
@@ -281,21 +320,20 @@
div.boxTitle {
overflow: hidden;
- font: bold 100% Georgia;
+ font-weight: bold;
color: #fff;
- padding: 0px 0px 0.2em;
- background: %(headerBgColor)s url("search.png") left bottom repeat-x;
+ background: %(boxTitleBgColor)s url("header.png") repeat-x 50% 50%;
}
div.boxTitle span,
div.sideBoxTitle span {
- padding: 0px 5px;
+ padding: 0px 0.5em;
white-space: nowrap;
}
div.searchBoxFrame div.boxTitle,
div.greyBoxFrame div.boxTitle {
- background: %(actionBoxTitleBgColor)s;
+ background: %(actionBoxTitleBgColor)s url("actionBoxHeader.png") repeat-x 50% 50% ;
}
div.sideBoxTitle span,
@@ -317,10 +355,11 @@
a.boxMenu {
display: block;
padding: 1px 9px 1px 3px;
- background: transparent url("puce_down.png") 98% 6px no-repeat;
+ background: transparent %(bulletDownImg)s;
}
+
a.boxMenu:hover {
- background: %(sideBoxBodyBgColor)s url("puce_down.png") 98% 6px no-repeat;
+ background: %(sideBoxBodyBgColor)s %(bulletDownImg)s;
cursor: pointer;
}
@@ -329,62 +368,6 @@
padding-left: 2em;
}
-ul.boxListing {
- margin: 0px;
- padding: 0px 3px;
-}
-
-ul.boxListing li,
-ul.boxListing ul li {
- list-style-type: none;
- margin: 0px;
- padding: 0px;
- background-image: none;
-}
-
-ul.boxListing ul {
- padding: 1px 3px;
-}
-
-ul.boxListing a {
- color: %(defaultColor)s;
- padding: 1px 9px 1px 3px;
-}
-
-ul.boxListing .selected {
- color: %(aColor)s;
- font-weight: bold;
-}
-
-ul.boxListing a.boxBookmark:hover,
-ul.boxListing a:hover,
-ul.boxListing ul li a:hover {
- color: #111100;
- text-decoration: none;
- background: %(sideBoxBodyBgColor)s;
-}
-
-ul.boxListing a.boxMenu:hover {
- cursor: pointer;
- border-top: medium none;
- background: %(sideBoxBodyBgColor)s url(puce_down.png) no-repeat scroll 98% 6px;
-}
-
-ul.boxListing ul li a:hover {
- background: %(sideBoxBodyBgColor)s url("bullet_orange.png") 0% 6px no-repeat;
-}
-
-ul.boxListing a.boxBookmark {
- padding-left: 3px;
- background-image: none;
- background:#fff;
-}
-
-ul.boxListing ul li a {
- background: #fff url("bullet_orange.png") 0% 6px no-repeat;
- padding: 1px 3px 0px 10px;
-}
-
div.searchBoxFrame div.boxContent {
padding: 4px 4px 3px;
background: #f0eff0 url("gradient-grey-up.png") left top repeat-x;
@@ -398,12 +381,11 @@
div.sideBoxTitle {
background: %(actionBoxTitleBgColor)s;
display: block;
- font: bold 100% Georgia;
+ font-weight: bold;
}
div.sideBox {
- padding: 0 0 0.2em;
- margin-bottom: 0.5em;
+ margin-bottom: 1em;
}
ul.sideBox,
@@ -412,7 +394,6 @@
}
ul.sideBox li{
- list-style-type : none;
padding: 0px 0px 1px 1px;
margin: 1px 0 1px 4px;
}
@@ -423,7 +404,7 @@
}
div.sideBoxBody a {
- color:#555544;
+ color: %(sideBoxColor)s;
}
div.sideBoxBody a:hover {
@@ -435,10 +416,11 @@
}
input.rqlsubmit{
- margin: 0px;
+ display: block;
width: 20px;
height: 20px;
background: %(buttonBgColor)s url("go.png") 50% 50% no-repeat;
+ vertical-align: bottom;
}
input#norql{
@@ -465,7 +447,7 @@
/* download box XXX move to its own file? */
div.downloadBoxTitle{
- background : #8FBC8F;
+ background : #8fbc8f;
font-weight: bold;
}
@@ -474,7 +456,7 @@
}
div.downloadBox div.sideBoxBody{
- background : #EEFED9;
+ background : #eefed9;
}
/**************/
@@ -485,9 +467,10 @@
border-bottom: 1px solid %(pageContentBorderColor)s;
}
+/* pagination */
span.slice a:visited,
span.slice a:hover{
- color: #555544;
+ color: %(helperColor)s;
}
span.selectedSlice a:visited,
@@ -521,18 +504,17 @@
}
div.primaryRight{
- }
+ margin-left: %(defaultLayoutMargin)s;
+}
div.metadata {
font-size: 90%;
margin: 5px 0px 3px;
- color: #666;
- font-style: italic;
+ color: %(helperColor)s;
text-align: right;
}
div.section {
-/* margin-top: 0.5em; */
width:100%;
}
@@ -567,49 +549,49 @@
.warning,
.message,
.errorMessage{
- padding: 0.3em 0.3em 0.3em 1em;
+ padding: 0.2em;
font-weight: bold;
}
.searchMessage{
- padding-top: %(defaultLayoutMargin)s;
+ margin-top: %(defaultLayoutMargin)s;
}
.loginMessage {
margin: 4px 0px;
font-weight: bold;
- color: %(headerBgColor)s;
+ color: %(aColor)s;
}
div#appMsg {
+ margin-bottom: %(defaultLayoutMargin)s;
border: 1px solid %(actionBoxTitleBgColor)s;
- margin-bottom: %(defaultLayoutMargin)s;
}
.message {
- margin: 0px;
- background: #fff url("information.png") 5px center no-repeat;
+ background: %(msgBgColor)s %(infoMsgBgImg)s;
padding-left: 15px;
}
.errorMessage {
margin: 10px 0px;
padding-left: 25px;
- background: #fff url("critical.png") 2px center no-repeat;
- color: #ed0d0d;
+ background: %(msgBgColor)s url("critical.png") 2px center no-repeat;
+ color: %(errorMsgColor)s;
border: 1px solid %(actionBoxTitleBgColor)s;
}
+/* search-associate message */
.stateMessage {
border: 1px solid %(pageContentBorderColor)s;
- background: #fff url("information.png") 10px 50% no-repeat;
- padding:4px 0px 4px 20px;
+ background: %(msgBgColor)s %(infoMsgBgImg)s;
+ padding: 0.1em 0 0.1em 20px;
}
/* warning messages like "There are too many results ..." */
.warning {
padding-left: 25px;
- background: #f2f2f2 url("critical.png") 3px 50% no-repeat;
+ background: %(msgBgColor)s url("critical.png") 3px 50% no-repeat;
}
/* label shown in the top-right hand corner during form validation */
@@ -628,27 +610,26 @@
/***************************************/
table.listing {
- width: 100%;
- padding: 10px 0em;
- color: %(defaultColor)s;
- border: 1px solid %(listingBorderColor)s;
+ width: 100%;
+ font-size: 0.9167em;
+ padding: 10px 0em;
+ color: %(defaultColor)s;
+ border: 1px solid %(listingBorderColor)s;
+ margin-bottom: 1em;
}
-table.listing tr th {
+table.listing th {
font-weight: bold;
- background: #dfdfdf;
font-size: 8pt;
- padding: 3px 0px 3px 5px;
+ background: %(listingHeaderBgColor)s;
+ padding: 2px 4px;
border: 1px solid %(listingBorderColor)s;
- border-right:none}
-
-table.listing thead tr {
-/* border: 1px solid #dfdfdf; */
+ border-right:none;
+ /* white-space: nowrap; */
}
-
table.listing thead th.over {
- background-color: #746b6b;
+ background-color: %(listingHeaderBgColor)s;
cursor: pointer;
}
@@ -658,8 +639,7 @@
}
table.listing td {
- padding: 4px;
- padding: 3px 0px 3px 5px;
+ padding: 3px;
vertical-align: top;
border: 1px solid %(listingBorderColor)s;
border-right: none;
@@ -686,9 +666,15 @@
top: -1px;
}
+table.listing input,
+table.listing textarea {
+ background: %(listingHihligthedBgColor)s;
+}
+
table.htableForm {
vertical-align: middle;
}
+
table.htableForm td{
padding-left: 1em;
padding-top: 0.5em;
@@ -718,27 +704,26 @@
color: #ff0000;
}
-
/***************************************/
/* addcombobox */
/***************************************/
-input#newopt{
- width:120px ;
- display:block;
- float:left;
- }
+input#newopt {
+ display: block;
+ float: left;
+ width: 120px;
+}
div#newvalue{
- margin-top:2px;
- }
+ margin-top: 2px;
+}
-#add_newopt{
- background: %(buttonBgColor)s url("go.png") 50% 50% no-repeat;
- width: 20px;
- line-height: 20px;
- display:block;
- float:left;
+#add_newopt {
+ display: block;
+ float: left;
+ width: 20px;
+ line-height: 20px;
+ background: %(buttonBgColor)s url("go.png") 50% 50% no-repeat;
}
/***************************************/
@@ -749,7 +734,6 @@
margin: 1em 1em 0px 0px;
border: 1px solid %(buttonBorderColor)s;
border-color: %(buttonBorderColor)s %(actionBoxTitleBgColor)s %(actionBoxTitleBgColor)s %(buttonBorderColor)s;
- background: %(buttonBgColor)s url("button.png") bottom left repeat-x;
}
/* FileItemInnerView jquery.treeview.css */
@@ -759,6 +743,94 @@
}
/***************************************/
+/* lists */
+/***************************************/
+
+ul.section,
+ul.startup {
+ margin-bottom: 0px;
+}
+
+ul.startup li,
+ul.section li {
+ margin-left:0px
+}
+
+ul.boxListing {
+ margin: 0px;
+ padding: 0px 3px;
+}
+
+ul.boxListing li,
+ul.boxListing ul li {
+ margin: 0px;
+ padding: 0px;
+ background-image: none;
+}
+
+ul.boxListing ul {
+ padding: 1px 3px;
+}
+
+ul.boxListing a {
+ color: %(defaultColor)s;
+ display:block;
+ padding: 1px 9px 1px 3px;
+}
+
+ul.boxListing .selected {
+ color: %(aColor)s;
+ font-weight: bold;
+}
+
+ul.boxListing a.boxMenu:hover {
+ border-top: medium none;
+ background: %(sideBoxBodyBgColor)s %(bulletDownImg)s;
+}
+
+ul.boxListing a.boxBookmark {
+ padding-left: 3px;
+ background-image: none;
+ background:#fff;
+}
+
+ul.simple li,
+ul.boxListing ul li ,
+.popupWrapper ul li {
+ background: transparent url("bullet_orange.png") no-repeat 0% 6px;
+}
+
+ul.boxListing a.boxBookmark:hover,
+ul.boxListing a:hover,
+ul.boxListing ul li a:hover {
+ text-decoration: none;
+ background: %(sideBoxBodyBgColor)s;
+}
+
+ul.boxListing ul li a:hover{
+ background-color: transparent;
+}
+
+ul.boxListing ul li a {
+ padding: 1px 3px 0px 10px;
+}
+
+ul.simple li {
+ padding-left: 8px;
+}
+
+.popupWrapper ul {
+ padding:0.2em 0.3em;
+ margin-bottom: 0px;
+}
+
+.popupWrapper ul li {
+ padding-left: 8px;
+ margin-left: 0px;
+ white-space: nowrap;
+}
+
+/***************************************/
/* footer */
/***************************************/
@@ -770,7 +842,6 @@
text-decoration: none;
}
-
/****************************************/
/* FIXME must by managed by cubes */
/****************************************/
@@ -779,16 +850,6 @@
color: gray;
}
-
-/***************************************/
-/* FIXME : Deprecated ? entity view ? */
-/***************************************/
-.title {
- text-align: left;
- font-size: large;
- font-weight: bold;
-}
-
.validateButton {
margin: 1em 1em 0px 0px;
border: 1px solid %(buttonBorderColor)s;
@@ -805,12 +866,42 @@
}
/********************************/
-/* overwite other css here */
+/* rest releted classes */
+/********************************/
+
+img.align-right {
+ margin-left: 1.5em;
+}
+
+img.align-left {
+ margin-right: 1.5em;
+}
+
+/********************************/
+/* overwite other css here */
/********************************/
/* ui.tabs.css */
-ul .ui-tabs-nav,
-ul .ui-tabs-panel {
- font-family: %(defaultFont)s;
+ul.ui-tabs-nav,
+div.ui-tabs-panel {
+ font-family: %(defaultFontFamily)s;
font-size: %(defaultSize)s;
}
+
+div.ui-tabs-panel {
+ border-top:1px solid #b6b6b6;
+}
+
+ul.ui-tabs-nav a {
+ color: #3d3d3d;
+}
+
+ul.ui-tabs-nav a:hover {
+ color: #000;
+}
+
+img.ui-datepicker-trigger {
+ margin-left: 0.5em;
+ vertical-align: bottom;
+}
+
--- a/web/data/cubicweb.form.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.form.css Mon Jun 21 16:13:41 2010 +0200
@@ -9,7 +9,6 @@
width: 100%;
font-size : 160%;
font-weight: bold;
- color: #ff4500;
padding-bottom : 0.4em;
text-transform: capitalize;
margin-bottom: 0.6em
@@ -23,9 +22,8 @@
div.iformTitle {
font-weight: bold;
font-size: 110%;
- color: #222211;
- background: #e4ead8;
- border: 1px solid #E4EAD8; /*#b7b6a3 */
+ background: %(formHeaderBgColor)s;
+ border: 1px solid %(formHeaderBgColor)s; /*#b7b6a3 */
border-bottom: none;
}
@@ -46,14 +44,14 @@
}
fieldset.subentity {
- border: 1px solid #E4EAD8;
+ border: 1px solid %(formHeaderBgColor)s;
display: block;
margin-bottom: 1em;
padding: 0.4em;
}
table.attributeForm {
- border: 1px solid #E4EAD8;
+ border: 1px solid %(formHeaderBgColor)s;
margin-bottom: 1em;
padding: 0.8em 1.2em;
width: 100%;
@@ -91,7 +89,7 @@
table.attributeForm input,
table.attributeForm textarea,
table.attributeForm select {
- border: 1px solid #E4EAD8; /*#b7b6a3*/
+ border: 1px solid %(formHeaderBgColor)s; /*#b7b6a3*/
}
table.attributeForm textarea {
@@ -163,10 +161,10 @@
}
a.editionPending {
- color: #557755;
+ color: #9c9b24; /*557755*/
font-weight: bold;
}
-
+
div.pendingDelete {
text-decoration: line-through;
}
@@ -187,22 +185,20 @@
display: inline;
}
-div.editableField:hover,
-div.editableField p:hover {
- background-color: #eeedd9;
-}
+/* div.editableField:hover, */
+/* div.editableField p:hover { */
+/* background-color: #eeedd9; */
+/* } */
-.error input { /* error added by the form renderer */
- background: transparent url("error.png") 100% 50% no-repeat;
-}
+.error input, /* error added by the form renderer */
input.error { /* error added by javascript */
- background: transparent url("error.png") 100% 50% no-repeat;
+ background: transparent %(errorMsgBgImg)s;
}
span.errorMsg {
display: block;
font-weight: bold;
- color: #ed0d0d;
+ color: %(errorMsgColor)s;
}
option.separator {
@@ -216,12 +212,12 @@
font-style: italic;
font-size: 110%;
padding-left: 2em;
- background : #f8f8ee url("information.png") 5px center no-repeat ;
+ background : %(msgBgColor)s %(infoMsgBgImg)s;
}
.helper{
font-size: 96%;
- color: #555544;
+ color: %(helperColor)s;
}
.helper:hover {
@@ -231,8 +227,8 @@
.validateButton {
margin: 1em 1em 0px 0px;
- border: 1px solid #edecd2;
- border-color:#edecd2 #cfceb7 #cfceb7 #edecd2;
- background: #fffff8 url("button.png") bottom left repeat-x;
+ border-width: 1px;
+ border-style: solid;
+ border-color: %(buttonBorderColor)s %(actionBoxTitleBgColor)s %(actionBoxTitleBgColor)s %(buttonBorderColor)s;
+ background: %(buttonBgColor)s %(buttonBgImg)s;
}
-
--- a/web/data/cubicweb.ie.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.ie.css Mon Jun 21 16:13:41 2010 +0200
@@ -4,8 +4,20 @@
margin-top: 0px;
}
-/* quick and dirty solution for pop to be
+/* quick and dirty solution for pop to be
correctly displayed on right edge of window */
-div.popupWrapper{
+div.popupWrapper{
direction:rtl;
}
+
+div#rqlinput input.rqlsubmit{
+ height: 24px;
+ width: 24px;
+}
+
+
+table#mainLayout #navColumnLeft,
+table#mainLayout #navColumnRight {
+ width: auto;
+}
+
--- a/web/data/cubicweb.iprogress.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.iprogress.css Mon Jun 21 16:13:41 2010 +0200
@@ -8,11 +8,11 @@
/* progressbar */
/******************************************************************************/
-.done{ background:red }
+.done { background:red }
-.inprogress{ background:green }
+.inprogress { background:green }
-.overpassed{ background: yellow}
+.overpassed { background: yellow}
canvas.progressbar {
@@ -20,64 +20,59 @@
}
.progressbarback {
- border: 1px solid #000000;
- background: transparent;
- height: 10px;
- width: 100px;
+ border: 1px solid #000000;
+ background: transparent;
+ height: 10px;
+ width: 100px;
}
/******************************************************************************/
/* progress table */
/******************************************************************************/
-table.progress{
+table.progress {
/* The default table view */
- margin: 10px 0px;
- color : #000;
- width:100%;
- font-size:98%;
- border:2px solid #ebe8d9;
+ margin: 10px 0px 1em;
+ width: 100%;
+ font-size: 0.9167em;
}
-table.progress th{
- text-align:left;
- white-space:nowrap;
- font-weight : bold;
- background:#ebe8d9 url("button.png") repeat-x;
- padding:2px 3px;
+table.progress th {
+ white-space: nowrap;
+ font-weight: bold;
+ background: %(listingHeaderBgColor)s;
+ padding: 2px 4px;
+ font-size:8pt;
}
table.progress th,
-table.progress td{
- border: 1px solid #dedede;
- margin:0px;
+table.progress td {
+ border: 1px solid %(listingBorderColor)s;
}
-table.progress td{
- text-align:right;
- padding:2px 5px 2px 2px;
+table.progress td {
+ text-align: right;
+ padding: 2px 3px;
}
table.progress th.tdleft,
-table.progress td.tdleft{
- text-align:left;
- padding:2px 3px 2px 5px;
+table.progress td.tdleft {
+ text-align: left;
+ padding: 2px 3px 2px 5px;
}
-
-table.progress tr.highlighted{
- background-color: #f4f5ed;
+table.progress tr.highlighted {
+ background-color: %(listingHihligthedBgColor)s;
}
table.progress tr.highlighted .progressbarback {
- border: 1px solid #555;
+ border: 1px solid %(listingHihligthedBgColor)s;
}
table.progress .progressbarback {
- border: 1px solid #777;
+ border: 1px solid #777;
}
-.progress_data{
- padding-right:3px;
-}
-
+.progress_data {
+ padding-right: 3px;
+}
\ No newline at end of file
--- a/web/data/cubicweb.login.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.login.css Mon Jun 21 16:13:41 2010 +0200
@@ -11,7 +11,7 @@
right: 0px;
width: 26em;
padding: 0px 1px 1px;
- background: #E4EAD8;
+ background: %(listingBorderColor)s;
}
div#popupLoginBox label{
@@ -30,13 +30,13 @@
margin-left: -14em;
width: 28em;
background: #fff;
- border: 2px solid #cfceb7;
+ border: 2px solid %(actionBoxTitleBgColor)s;
padding-bottom: 0.5em;
text-align: center;
}
div#loginBox h1 {
- color: #FF7700;
+ color: %(aColor)s;
font-size: 140%;
}
@@ -46,7 +46,7 @@
font-size: 140%;
text-align: center;
padding: 3px 0px;
- background: #ff7700 url("banner.png") left top repeat-x;
+ background: %(headerBgColor)s url("banner.png") repeat-x top left;
}
div#loginBox div#loginContent form {
@@ -80,7 +80,7 @@
.loginButton {
border: 1px solid #edecd2;
- border-color:#edecd2 #cfceb7 #cfceb7 #edecd2;
+ border-color: #edecd2 %(actionBoxTitleBgColor)s %(actionBoxTitleBgColor)s #edecd2;
margin: 2px 0px 0px;
background: #f0eff0 url("gradient-grey-up.png") left top repeat-x;
}
--- a/web/data/cubicweb.preferences.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.preferences.css Mon Jun 21 16:13:41 2010 +0200
@@ -5,106 +5,90 @@
* :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
*/
+div.propertiesform {
+ margin-bottom: 1.2857em;
+ line-height: 1.2857em;
+ font-size: %(h3FontSize)s;
+}
-.preferences .validateButton{
- margin-top:0px;
+div.propertiesform a {
+ display: block;
+ margin: 10px 0px 6px 0px;
+ padding-left: 16px;
+ font-weight: bold;
+ color: #000;
+ background: transparent url("puce_down.png") 3px center no-repeat;
+ text-decoration:none;
+}
+
+div.propertiesform a:hover {
+ background-color: %(listingHeaderBgColor)s;
+}
+
+.preferences .validateButton {
+ margin-top: 0px;
}
-fieldset.preferences{
- border : 1px solid #CFCEB7;
- margin:7px 1em 0;
- padding:2px 6px 6px;
+fieldset.preferences {
+ margin: 7px 1em 0;
+ padding: 2px 6px 6px;
+ border : 1px solid %(pageContentBorderColor)s;
}
div.component {
- margin-left: 1em;
-}
-
-div.componentLink{
- margin-top:0.3em;
- }
-
-a.componentTitle{
- font-weight:bold;
- color: #000/*#0083AB;*/
- }
-
-a.componentTitle:visited{
- color: #000;
+ margin: 0 0 1em 16px;
}
-h2.propertiesform a{
- display:block;
- margin: 10px 0px 6px 0px;
+a.componentTitle {
font-weight: bold;
- color: #000;
- padding: 0.2em 0.2em 0.2em 16px;
- background:#eeedd9 url("puce_down.png") 3px center no-repeat;
- font-size:89%;
+ color: #000
}
-h2.propertiesform a:hover{
- background-color:#cfceb7;
-}
-
-h2.propertiesform a:hover,
-h2.propertiesform a:visited{
- text-decoration:none;
- color: #000;
+a.componentTitle:visited {
+ color: #000;
}
div.preffield {
- margin-bottom: 5px;
- padding:2px 5px;
- background:#eeedd9;
+ margin-bottom: 5px;
+ padding: 2px 5px;
+ background: %(listingHeaderBgColor)s;
}
-div.prefinput{
- margin:.3em;
+div.prefinput {
+ margin: .3em;
}
-
div.prefinput select.changed,
-div.prefinput input.changed{
- border: 1px solid #000;
- font-weight:bold;
-
-}
-
-div.prefinput select,
-div.prefinput input{
- background:#fff;
- border: 1px solid #CFCEB7;
+div.prefinput input.changed {
+ border: 1px solid #000;
+ font-weight: bold;
}
.prefinput input.error {
- /* background:#fff url(error.png) no-repeat scroll 100% 50% !important; */
- border:1px solid red !important;
- color:red;
- padding-right:1em;
+ border:1px solid red !important;
+ color:red;
+ padding-right:1em;
}
-
-div.formsg{
- font-weight:bold;
- margin:0.5em 0px;
+div.formsg {
+ font-weight: bold;
+ margin: 0.5em 0px;
}
-
-div.critical{
- color:red;
- padding-left:20px;
- background:#fff url(critical.png) no-repeat;
+div.critical {
+ color: red;
+ padding-left: 20px;
+ background: #fff url(critical.png) no-repeat;
}
-div.formsg .msg{
- color : green;
+div.formsg .msg {
+ color: green;
}
-.helper{
+.helper {
font-size: 96%;
- color: #555544;
- padding:0;
+ color: %(helperColor)s;
+ padding: 0;
}
div.prefinput .helper:hover {
@@ -112,6 +96,6 @@
cursor: default;
}
-div.openlink{
- display:inline;
+div.openlink {
+ display: inline;
}
--- a/web/data/cubicweb.reset.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.reset.css Mon Jun 21 16:13:41 2010 +0200
@@ -10,53 +10,44 @@
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- font-size: 100%;
- vertical-align: baseline;
- background: transparent;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ outline: 0;
+ font-size: 100%;
+ vertical-align: baseline;
+ background: transparent;
}
body {
- line-height: 1;
+ line-height: 1;
}
ol, ul {
- list-style: none;
+ list-style: none;
}
blockquote, q {
- quotes: none;
+ quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
- content: '';
- content: none;
+ content: '';
+ content: none;
}
/* remember to define focus styles! */
:focus {
- outline: 0;
+ outline: 0;
}
/* remember to highlight inserts somehow! */
ins {
- text-decoration: none;
+ text-decoration: none;
}
del {
- text-decoration: line-through;
+ text-decoration: line-through;
}
/* tables still need 'cellspacing="0"' in the markup */
table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-/* Logilab */
-img{
- border: none;
-}
-
-fieldset {
- border: none;
-}
+ border-collapse: collapse;
+ border-spacing: 0;
+}
\ No newline at end of file
--- a/web/data/cubicweb.tablesorter.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.tablesorter.css Mon Jun 21 16:13:41 2010 +0200
@@ -1,12 +1,4 @@
-/* tables */
-/*table.tablesorter {
- font-family:arial;
- background-color: #CDCDCD;
- margin:10px 0pt 15px;
- font-size: 8pt;
- width: 100%;
- text-align: left;
-} */
+/* sortable tables */
table.listing tr .headerSortUp {
background-image: url(asc.gif);
@@ -15,7 +7,7 @@
background-image: url(desc.gif);
}
table.listing tr .headerSortDown, table.listing tr .headerSortUp {
- background-color: #DDD;
+ background-color: %(listingBorderColor)s;
background-repeat: no-repeat;
background-position: center right;
}
--- a/web/data/cubicweb.tableview.css Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/cubicweb.tableview.css Mon Jun 21 16:13:41 2010 +0200
@@ -6,7 +6,7 @@
font-weight: bold;
background: #ebe8d9 url("button.png") repeat-x;
padding: 0.3em;
- border-bottom: 1px solid #cfceb7;
+ border-bottom: 1px solid %(actionBoxTitleBgColor)s;
text-align: left;
}
Binary file web/data/tab.png has changed
--- a/web/data/uiprops.py Mon Jun 21 16:01:57 2010 +0200
+++ b/web/data/uiprops.py Mon Jun 21 16:13:41 2010 +0200
@@ -4,7 +4,7 @@
# use the following line if you *need* to keep the old stylesheet
#STYLESHEETS = [data('cubicweb.old.css')]
STYLESHEETS = [data('cubicweb.reset.css'),
- data('cubicweb.css')]
+ data('cubicweb.css'), ]
STYLESHEETS_IE = [data('cubicweb.ie.css')]
STYLESHEETS_PRINT = [data('cubicweb.print.css')]
@@ -63,12 +63,14 @@
# default (body, html)
defaultColor = '#000'
-defaultFont = 'Verdana,sans-serif'
+defaultFontFamily = "'Bitstream Vera Sans','Lucida Grande','Lucida Sans Unicode','Geneva','Verdana',sans-serif"
defaultSize = '12px'
defaultLineHeight = '1.5'
defaultLineHeightEm = defaultLineHeight + 'em'
baseRhythmBg = 'rhythm18.png'
+inputHeight = '1.3em'
+inputPadding = 'O.2em'
# XXX
defaultLayoutMargin = '8px'
@@ -76,10 +78,11 @@
headerBgColor = '#ff7700'
# h
-h1FontSize = '1.5em'
-h1BorderBottomStyle = '0.06em solid black'
+h1FontSize = '1.5em' # 18px
h1Padding = '0 0 0.14em 0 '
h1Margin = '0.8em 0 0.5em'
+h1Color = '#000'
+h1BorderBottomStyle = '0.06em solid %s' % h1Color
h2FontSize = '1.33333em'
h2Padding = '0.4em 0 0.35em 0'
@@ -90,7 +93,7 @@
h3Margin = '0'
# links
-aColor = '#ff4500'
+aColor = '#e6820e'
aActiveColor = aVisitedColor = aLinkColor = aColor
# page frame
@@ -99,14 +102,34 @@
pageContentPadding = '1em'
pageMinHeight = '800px'
-# button
-buttonBorderColor = '#edecd2'
-buttonBgColor = '#fffff8'
+# boxes
+boxTitleBgColor = headerBgColor
+boxBodyBgColor = '#efefde'
# action, search, sideBoxes
actionBoxTitleBgColor = '#cfceb7'
-sideBoxBodyBgColor = '#eeedd9'
+sideBoxBodyBgColor = '#f8f8ee'
+sideBoxColor = '#555544'
+# table listing & co
+listingBorderColor = '#ccc'
+listingHeaderBgColor = '#efefef'
+listingHihligthedBgColor = '#fbfbfb'
+
+# puce
+bulletDownImg = 'url("puce_down.png") 98% 6px no-repeat'
-# table listing
-listingBorderColor = '#878787'
+#forms
+formHeaderBgColor = listingHeaderBgColor
+helperColor = '#555'
+
+# button
+buttonBorderColor = '#edecd2'
+buttonBgColor = '#fffff8'
+buttonBgImg = 'url("button.png") repeat-x 50% 50%'
+
+# messages
+msgBgColor = '#f8f8ee'
+infoMsgBgImg = 'url("information.png") 5px center no-repeat'
+errorMsgBgImg = 'url("error.png") 100% 50% no-repeat'
+errorMsgColor = '#ed0d0d'
--- a/web/views/basecomponents.py Mon Jun 21 16:01:57 2010 +0200
+++ b/web/views/basecomponents.py Mon Jun 21 16:13:41 2010 +0200
@@ -59,11 +59,9 @@
<form action="%s">
<fieldset>
<input type="text" id="rql" name="rql" value="%s" title="%s" tabindex="%s" accesskey="q" class="searchField" />
-<input type="submit" value="" class="rqlsubmit" tabindex="%s" />
</fieldset>
''' % (not self.cw_propval('visible') and 'hidden' or '',
- self._cw.build_url('view'), xml_escape(rql), req._('full text or RQL query'), req.next_tabindex(),
- req.next_tabindex()))
+ self._cw.build_url('view'), xml_escape(rql), req._('full text or RQL query'), req.next_tabindex()))
if self._cw.search_state[0] != 'normal':
self.w(u'<input type="hidden" name="__mode" value="%s"/>'
% ':'.join(req.search_state[1]))
--- a/web/views/cwproperties.py Mon Jun 21 16:01:57 2010 +0200
+++ b/web/views/cwproperties.py Mon Jun 21 16:13:41 2010 +0200
@@ -144,7 +144,7 @@
for label, group, form in sorted((_(g), g, f)
for g, f in mainopts.iteritems()):
status = css_class(self._group_status(group))
- w(u'<h2 class="propertiesform">%s</h2>\n' %
+ w(u'<div class="propertiesform">%s</div>\n' %
(make_togglable_link('fieldset_' + group, label.capitalize())))
w(u'<div id="fieldset_%s" %s>' % (group, status))
w(u'<fieldset class="preferences">')
@@ -154,7 +154,7 @@
for label, group, objects in sorted((_(g), g, o)
for g, o in groupedopts.iteritems()):
status = css_class(self._group_status(group))
- w(u'<h2 class="propertiesform">%s</h2>\n' %
+ w(u'<div class="propertiesform">%s</div>\n' %
(make_togglable_link('fieldset_' + group, label.capitalize())))
w(u'<div id="fieldset_%s" %s>' % (group, status))
# create selection
--- a/web/views/navigation.py Mon Jun 21 16:01:57 2010 +0200
+++ b/web/views/navigation.py Mon Jun 21 16:13:41 2010 +0200
@@ -269,7 +269,7 @@
# make a link to see them all
if show_all_option:
url = xml_escape(req.build_url(__force_display=1, **params))
- w(u'<span><a href="%s">%s</a></span>\n'
+ w(u'<div><a href="%s">%s</a></div>\n'
% (url, req._('show %s results') % len(rset)))
rset.limit(offset=start, limit=stop-start, inplace=True)
--- a/web/views/schema.py Mon Jun 21 16:01:57 2010 +0200
+++ b/web/views/schema.py Mon Jun 21 16:13:41 2010 +0200
@@ -87,8 +87,8 @@
self._cw.add_css('cubicweb.acl.css')
w = self.w
_ = self._cw._
- w(u'<table class="schemaInfo">')
- w(u'<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % (
+ w(u'<table class="listing schemaInfo">')
+ w(u'<tr><th width="15%%">%s</th><th wdith="25%%">%s</th><th>%s</th></tr>' % (
_("permission"), _('granted to groups'), _('rql expressions')))
for action in erschema.ACTIONS:
w(u'<tr><td>%s</td><td>' % _(action))
@@ -203,13 +203,13 @@
url = xml_escape(self._cw.build_url('schema'))
self.w(u'<div id="schema_security">')
self.w(u'<h2 class="schema">%s</h2>' % _('Index'))
- self.w(u'<h4 id="entities">%s</h4>' % _('Entity types'))
+ self.w(u'<h3 id="entities">%s</h3>' % _('Entity types'))
ents = []
for eschema in sorted(entities):
ents.append(u'<a class="grey" href="%s#%s">%s</a>' % (
url, eschema.type, eschema.type))
self.w(u', '.join(ents))
- self.w(u'<h4 id="relations">%s</h4>' % _('Relation types'))
+ self.w(u'<h3 id="relations">%s</h3>' % _('Relation types'))
rels = []
for rschema in sorted(relations):
rels.append(u'<a class="grey" href="%s#%s">%s</a>' % (
--- a/web/views/startup.py Mon Jun 21 16:01:57 2010 +0200
+++ b/web/views/startup.py Mon Jun 21 16:13:41 2010 +0200
@@ -99,7 +99,7 @@
views = self._cw.vreg['views'].possible_views(self._cw, None)
if not views:
return
- self.w(u'<ul>')
+ self.w(u'<ul class="startup">')
for v in sorted(views, key=lambda x: self._cw._(x.title)):
if v.category != 'startupview' or v.__regid__ in ('index', 'tree', 'manage'):
continue
