Author: ludovic
Date: 2007-11-12 03:25:41 +0100 (Mon, 12 Nov 2007)
New Revision: 5824
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/help.vm
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
Log:
CURRIKI-1089 Implement Help for Curriculum Builder Styling
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/help.vm
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/help.vm
2007-11-12 01:25:43 UTC (rev 5823)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/help.vm
2007-11-12 02:25:41 UTC (rev 5824)
@@ -8,16 +8,15 @@
<div id="contentcontainer" class="help">
<div id="contentcontainerinner" class="contenthideright">
<div class="leftsidecolumns">
- <div id="contentcolumn">
+ <div id="leftPanels" class="panels left help">
+ #displaypanel("Panels.TOC")
+ </div>
+ <div id="contentcolumn">
<div class="main layoutsubsection">
- #template("space.vm")
#template("contentview.vm")
<div class="clearfloats"></div>
</div>
</div>
- <div id="leftPanels" class="panels left help">
- #displaypanel("Panels.TOC")
- </div>
<div class="clearfloats"></div>
</div>
</div>
@@ -27,7 +26,3 @@
</div>
</body>
</html>
-
-
-
-
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
2007-11-12 01:25:43 UTC (rev 5823)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
2007-11-12 02:25:41 UTC (rev 5824)
@@ -1470,9 +1470,11 @@
<div id="wizzard" class="asset-page">
#set($obj = $currDoc.getObject("XWiki.AssetClass", true))
#if(!$isPrint)
+<div class="asset-links">
<div class="righttext">
#displaylinks($currDoc)
</div>
+</div>
#end
<div class="asset-contents $mode">
#if(!$isPrint)
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
2007-11-12 01:25:43 UTC (rev 5823)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
2007-11-12 02:25:41 UTC (rev 5824)
@@ -1,12 +1,12 @@
@import "elements.css";
@import "classes.css";
[EMAIL PROTECTED] "xwiki.css";
[EMAIL PROTECTED] "wiki.css";
[EMAIL PROTECTED] "page.css";
[EMAIL PROTECTED] "xwiki.css";
[EMAIL PROTECTED] "wiki.css";
[EMAIL PROTECTED] "page.css";
@import "rss.css";
@import "screenlayout.css";
@import "microformats.css";
[EMAIL PROTECTED] "presentation.css";
[EMAIL PROTECTED] "presentation.css";
@import "colorsblack.css";
a{
@@ -211,10 +211,10 @@
}
#curriki-search-field-container{
- background-color: #FB2F00;
+ background-color: #FB2F00;
padding:1px 1px 1px 1px;
margin:0;
- width:227px;
+ width:227px;
border: 1px solid #FF7F00;
border-left: 1px solid #FFBF00;
border-top: 1px solid #FFBF00;
@@ -222,7 +222,7 @@
}
#curriki-search-field{
- background-color: #FF7F00;
+ background-color: #FF7F00;
padding: 3px 0px 3px 5px;
margin: 0px 0px 0px 0px;
border: 1px solid #FF7F00;
@@ -758,9 +758,7 @@
margin: 0px;
text-align: left;
}
-.titlebar_left{
- float: left;
-}
+
.titlebarRight{
/* max-width: 218px; */
overflow: hidden;
@@ -909,7 +907,7 @@
display: block;
color: #FFF !important;
font-weight: bold;
- height: 115px;
+ height: 115px;
width: 151px;
float: left;
margin-left: 43px;
@@ -1184,7 +1182,7 @@
border-bottom: 1px solid #999;
}
#contentcolumn {
- width: 100% !important;
+ width: auto;
overflow: hidden;
}
li.inline {
@@ -1387,7 +1385,7 @@
table.browse-results-table td,
table.search-resource-result-table td{
- padding: 1px 2px;
+ padding: 1px 2px;
height: 32px;
}
@@ -1650,7 +1648,7 @@
.rp { background-color:#c3d9ff; }
.roundedPanel{
- margin: 5px;
+ margin: 5px;
}
.ItemHeader {
@@ -1664,7 +1662,7 @@
.panelEditPage {
margin: 5px;
- padding: 5px;
+ padding: 5px;
background-color:white;
}
@@ -2113,7 +2111,7 @@
color: #FF4100;
margin: 15px 0 10px;
padding: 0;
- border-bottom: 1px solid #FF4100;
+ border-bottom: 1px solid #FF4100;
}
.curriki-subtitle, .move-modal-box .gwt-Label {
font: 13px Arial;
@@ -2121,7 +2119,7 @@
margin: 10px 0 5px;
}
.move-modal-box .gwt-Label {
- margin: 10px 0;
+ margin: 10px 0;
}
.move-modal-box-scroller {
height: 500px;
@@ -2152,7 +2150,7 @@
padding-left: 0;
}
textarea {
- background: #FFF;
+ background: #FFF;
border: 1px solid #B2B2B2;
border-bottom-color: #E5E5E5;
border-right-color: #E5E5E5;
@@ -2189,7 +2187,7 @@
border-collapse: collapse;
}
.dialog-choosetemplate-bottom table.help {
- margin: 0 0 0 200px;
+ margin: 0 0 0 200px;
}
.help-grid-head, .help-content-text {
border-bottom: 1px solid #FF4100;
@@ -2204,13 +2202,13 @@
color: #999;
}
-.help-content-image {
+.help-content-image {
margin: 10px;
}
button {
cursor: pointer;
}
-.gwt-ButtonOrange, .collections-dialog-next, .addfile-dialog-next,
.metadata-save, .thankyou-dialog-continue, .login-Button,
.addresource-dialog-next, .tk-ModalDialog-content
.dialog-proposedduplication-continue,
+.gwt-ButtonOrange, .collections-dialog-next, .addfile-dialog-next,
.metadata-save, .thankyou-dialog-continue, .login-Button,
.addresource-dialog-next, .tk-ModalDialog-content
.dialog-proposedduplication-continue,
.tk-ModalDialog-content .dialog-proposedduplication-copy, .layoutsubsection
input[type="submit"] {
background: #FF7F00;
color: #FFF;
@@ -2218,7 +2216,7 @@
}
.gwt-ButtonGrey, .collections-dialog-cancel, .addfile-dialog-cancel,
.dialog-metadata-button-cancel, .menu-add, .move-modal-box .gwt-Button,
.find-selector-cancel, .dialog-choosetemplate-cancel,
.find-results-table-result .gwt-Button, .addresource-dialog-cancel,
.tk-ModalDialog-content .dialog-proposedduplication-cancel,
.history-rollback-button {
background: #DCDCDC;
- border: 1px solid #A5A5A5;
+ border: 1px solid #A5A5A5;
color: #3F3F3F;
margin-right: 2px;
}
@@ -2249,7 +2247,7 @@
max-width: 180px;
}
.dialog-choosetemplate-bottom .gwt-ButtonNav {
- height: 35px;
+ height: 35px;
}
.find-selector-find {
margin-right: 2px;
@@ -2287,12 +2285,12 @@
}
.tk-ModalDialog-content .find-selector-container div {
font-size: 12px;
- font-weight: bold;
+ font-weight: bold;
color: #FFF;
- background-color: #4D4F8C;
+ background-color: #4D4F8C;
}
.tk-ModalDialog-content .find-selector-container div .gwt-Label {
- padding-bottom: 10px;
+ padding-bottom: 10px;
}
.tk-ModalDialog-content .find-selector-container .find-selector
select.gwt-ListBox {
font-size: 10px;
@@ -2324,7 +2322,7 @@
.gwt-TabBar {
background: #FFF;
font: 12px Arial;
- font-weight: bold;
+ font-weight: bold;
}
.gwt-TabBar .gwt-TabBarItem {
border-top: 1px solid #C9C9C9;
@@ -2366,7 +2364,7 @@
}
html>body .metadata-edit {
border: 0;
- padding-bottom: 0px;
+ padding-bottom: 0px;
}
.metadata-save {
float: right;
@@ -2376,7 +2374,7 @@
margin: 10px;
padding: 0;
}
-.ygtvlabel, .ygtvlabel:link, .ygtvlabel:visited, .ygtvlabel:hover {
+.ygtvlabel, .ygtvlabel:link, .ygtvlabel:visited, .ygtvlabel:hover {
font: 12px Arial;
color: #000;
}
@@ -2415,7 +2413,7 @@
overflow: hidden;
}
.gwt-Tree .asset-tree-item-insert-here .gwt-TreeItem {
- color: #FF4100;
+ color: #FF4100;
}
.collections-dialog-actions {
text-align: right;
@@ -2717,7 +2715,7 @@
}
#header-title-link {
padding-top: 5px;
- padding-left: 20px;
+ padding-left: 20px;
}
#header-title-link a {
color: #4782C5;
@@ -2753,7 +2751,7 @@
color: #CCC;
font-size: 12px;
padding: 5px auto;
- margin: 0 auto;
+ margin: 0 auto;
}
.pagination-item-page {
color: #000;
@@ -2786,7 +2784,7 @@
margin-bottom: 30px;
}
.dialog-choosetemplate-bottom .dialog-choosetemplate-chooser .gwt-HTML {
- font-weight: bold;
+ font-weight: bold;
margin-top: 15px;
}
.thankyou-dialog-text div {
@@ -2804,7 +2802,7 @@
}
.items-panel ul.star {
padding-left: 20px;
-}
+}
.item-download-link {
cursor: pointer;
}
@@ -2923,14 +2921,14 @@
}
html>body table.ItemPanel_selected .gwt-Image, html>body
table.ItemPanel_selected div.item-description {
margin-left: 220px;
-}
+}
table.ItemPanel_selected div {
width: 200px;
margin: 0;
padding: 0 10px 10px 10px;
}
table.ItemPanel_selected textarea.gwt-TextArea {
- margin-bottom: 10px;
+ margin-bottom: 10px;
height: 50px;
width: 450px;
}
@@ -3002,7 +3000,7 @@
background-color: #ff4100;
}
.preview-page .gwt-HTML, .preview-page .asset-page {
-
+
}
.preview-page #dropshadow {
background: #f2f2f2;
@@ -3023,7 +3021,7 @@
margin: 0;
height: 280px;
border: 1px solid #ccc;
- border-top: 0;
+ border-top: 0;
}
.item-description {
margin: 10px 0;
@@ -3063,7 +3061,7 @@
margin-left: 15px;
}
.item-panel textarea.gwt-TextArea {
- margin-bottom: 10px;
+ margin-bottom: 10px;
height: 50px;
width: 450px;
}
@@ -3209,7 +3207,7 @@
}
.find-results-panel .find-results .find-results-scroller {
- width: 790px;
+ width: 790px;
}
.find-results-table-title .gwt-Label {
white-space: nowrap;
@@ -3241,7 +3239,7 @@
border-width: 0px !important;
border-left: 1px solid #A5A5A5 !important;
margin: 10px auto 30px;
- width: 100%;
+ width: 100%;
}
.item-panel table.item-panel2 td table.item-panel-content table.wiki-table {
margin: 10px auto 30px;
@@ -3274,7 +3272,7 @@
.more-info a {
cursor: pointer;
color: #1963AA;
- text-decoration: none;
+ text-decoration: none;
}
.more-info a:hover {
color: #333365;
@@ -3306,7 +3304,7 @@
margin: 20px 0;
}
table.history-versions td {
- padding: 5px 0;
+ padding: 5px 0;
}
.history-versions a {
cursor: pointer;
@@ -3419,10 +3417,10 @@
border: 1px solid #FF4100 !important;
color: #FF4100 !important;
padding: 0;
- margin: 0;
+ margin: 0;
}
#printcontainer_compare #changescontent div#changes-title h1 {
- margin: 0;
+ margin: 0;
background-color: #f6f8c9;
font-family:Helvetica,sans-serif;
font-size:12px;
@@ -3430,14 +3428,14 @@
font-style:normal;
font-weight:bold;
padding:2px 8px;
-}
+}
#printcontainer_compare div {
- background-color: #FFF;
+ background-color: #FFF;
}
#printcontainer_compare table {
border-left: 5px solid #FFF;
border-right: 5px solid #FFF;
- border-bottom: 10px solid #FFF;
+ border-bottom: 10px solid #FFF;
}
#printcontainer_compare th {
background-color: #333365;
@@ -3459,7 +3457,7 @@
}
.crs_review {
font-family:Arial,sans-serif;
- font-size:13px;
+ font-size:13px;
}
.crs_reviewtitle {
color: #2264A1;
@@ -3490,7 +3488,7 @@
clear: both;
}
.crs_reviewreview {
- border-left: 1px solid #919179;
+ border-left: 1px solid #919179;
}
.crs_reviewpending a {
font-style: normal;
@@ -3503,19 +3501,19 @@
/*CRS for the comments tab in the main site */
.crs_reviews {
background: #FFF;
- border: 1px solid #D2D2D2;
+ border: 1px solid #D2D2D2;
padding: 10px;
}
.crs_reviewstitle {
color: #2264A1;
- border-bottom: 1px solid #2264A1;
+ border-bottom: 1px solid #2264A1;
}
.crs_reviewstitle .gwt-HTML {
margin: 0;
}
.crs_reviewsreview {
padding:15px 0;
- border-bottom: 1px dotted #D2D2D2;
+ border-bottom: 1px dotted #D2D2D2;
}
.crs_reviewsdate, .crs_reviewsdate .gwt-HTML {
color: #919179;
@@ -3524,7 +3522,7 @@
}
.crs_reviewsreview table {
font-family:Arial,sans-serif;
- font-size:13px;
+ font-size:13px;
}
.crs_reviewscomment table {
width: 570px !important;
@@ -3533,10 +3531,10 @@
margin-left: 10px !important;
}
table.comment-page td td {
- padding: 0;
+ padding: 0;
}
table.comment-page td {
- padding: 0 10px;
+ padding: 0 10px;
}
.layoutsubsection .xwikiintracontent .collapsed {
display: none;
@@ -3583,7 +3581,7 @@
}
.metadata-edit-panel .crs_reviewnominate a, .metadata-edit-panel
.crs_reviewreview a {
text-decoration: none;
- font-style: normal;
+ font-style: normal;
}
.metadata-edit-panel span.gwt-CheckBox {
display: block;
@@ -3728,7 +3726,7 @@
color:#666699 !important;
}
.xwikipanelcontents .curriki_toc ul li.treeitem {
- padding-left: 12px;
+ padding-left: 12px;
}
.xwikipanelcontents .curriki_toc ul li.selected a {
background-color: #FFFFFF;
@@ -3761,7 +3759,7 @@
background: #FFFFCE url(/xwiki/gwt/tree_closed.gif) no-repeat;
}
.curriki_toc li.expanded, .curriki_toc li.collapsed {
-
+
}
/* Nominate dialogs */
@@ -3804,7 +3802,7 @@
#searchElement table table.search-top-titlebar {
padding: 1px 5px;
margin: 10px 0;
- width: 100%;
+ width: 100%;
}
#searchElement table {
width: 100%;
@@ -3831,7 +3829,7 @@
#searchElement .gwt-Label {
font-size: 12px;
white-space: nowrap;
-
+
}
/* ADD */
@@ -3918,7 +3916,7 @@
padding: 5px;
padding-bottom: 0;
margin-left: -30px;
- margin-top: -33px;
+ margin-top: -33px;
overflow: hidden;
}
.search-title-description-popup {
@@ -3961,7 +3959,7 @@
font-size: 11px;
}
#searchElement table table.search-pagination .search-pagination-nav
.pagination-item-current {
- color: #F6797F;
+ color: #F6797F;
}
.find-results-table-result-odd {
background-color: #F2F2F2;
@@ -4006,7 +4004,7 @@
}
.search-selector-main .gwt-Label, .search-selector-filters .gwt-Label {
color: #FFF;
- font-size: 12px;
+ font-size: 12px;
}
.search-selector-filters .gwt-ListBox {
font-size: 12px;
@@ -4127,7 +4125,7 @@
width: 132px !important;
width: 142px;
height: 200px;
- text-align: center;
+ text-align: center;
border: 1px solid #000;
padding: 10px 5px;
font-size: 12px;
@@ -4213,7 +4211,7 @@
line-height: 12px;
border-width: 0px;
padding: 0;
- margin: 0;
+ margin: 0;
}
/* Fix the long words issue */
@@ -4290,11 +4288,11 @@
}
.dialog-help-caption-text {
- float: left;
+ float: left;
}
.dialog-help-caption-button {
- float: right;
+ float: right;
}
#body.admin {
@@ -4306,7 +4304,7 @@
}
.dialog-help-frame {
- border: 0px;
+ border: 0px;
}
body.admin {
@@ -4475,13 +4473,50 @@
margin-right: 0px;
}
-.asset-contents, .asset-contents .titlebar,.asset-contents
.asset-content-body, .asset-contents .asset-content-body-composite-source {
+.asset-contents.help,.asset-contents.help .titlebar,
+.asset-contents.help .asset-content-body, .asset-contents.help
.asset-content-body-composite-source {
width: auto;
margin-left: 0px;
margin-right: 0px;
}
-// change asset styles depending on the mode (normal, print, help)
+.asset-contents.print,.asset-contents.print .titlebar,
+.asset-contents.print .asset-content-body, .asset-contents.print
.asset-content-body-composite-source {
+ width: auto;
+ margin-left: 0px;
+ margin-right: 0px;
+}
+
+.asset-contents .asset-content-body {
+ padding: 10px;
+}
+.contenthideright {
+ border-left: 0px;
+}
+.contenthideright{
+ margin-left: 213px;
+}
+#leftPanels{
+ margin-left: -213px;
+}
+
+.help #contentcontainerinner {
+ width: auto;
+ margin-right: 0px;
+}
+
+.help #contentcolumn {
+ float: none;
+ width: auto !important;
+}
+
+.help.contenthideright {
+ margin-left: 0px;
+}
+.help.contenthideright #leftPanels{
+ margin-left: 0px;
+}
+
.asset-contents {
width: 600px;
}
@@ -4491,7 +4526,27 @@
width: 580px;
}
+.asset-contents .titlebar,
+.asset-contents .asset-content-body, .asset-contents
.asset-content-body-composite-source {
+ width: auto;
+ margin-left: 0px;
+ margin-right: 0px;
+}
+
+
+.asset-links {
+ width: 580px;
+ text-align: right;
+}
+
.asset-contents .asset-content-body {
padding: 10px;
}
+.righttext .titlebar_left {
+ float: left;
+}
+
+#leftPanels.left {
+ float: left;
+}
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
