From 6d3930d4ce489c7c3d79168fc98bb497aa233f92 Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 20 Nov 2009 01:19:36 +0000 Subject: [PATCH] Beginning to rework the Admin markup/CSS --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041476 --- src/Orchard.Web/Content/Admin/css/Site.css | 12 +- src/Orchard.Web/Content/Admin/css/autumn.css | 315 - .../Content/Admin/{Site.css => css/base.css} | 181 +- src/Orchard.Web/Content/Admin/css/dark.css | 316 - .../Admin/css/images/background_header.jpg | Bin 0 -> 2700 bytes .../Content/Admin/css/images/orchardLogo.jpg | Bin 0 -> 2646 bytes .../css/images/tableHeaderBackground.gif | Bin 0 -> 500 bytes .../Content/Admin/css/yui.reset-3.0.0.css | 126 + .../Content/Admin/css/yui.reset-3.0.0.min.css | 8 + src/Orchard.Web/Orchard.Web.csproj | 17 +- .../Orchard.CmsPages/Views/Admin/Edit.aspx | 10 +- .../Orchard.CmsPages/Views/Admin/Index.aspx | 4 +- .../Scripts/MicrosoftAjax.debug.js | 6850 ----------------- src/Orchard.Web/Scripts/MicrosoftAjax.js | 7 - .../Scripts/MicrosoftMvcAjax.debug.js | 387 - src/Orchard.Web/Scripts/MicrosoftMvcAjax.js | 25 - src/Orchard.Web/Views/Admin/Foot.aspx | 20 + src/Orchard.Web/Views/Admin/Head.aspx | 35 + src/Orchard.Web/Views/Admin/Header.aspx | 59 +- src/Orchard/Mvc/ViewPage.cs | 23 +- 20 files changed, 370 insertions(+), 8025 deletions(-) delete mode 100644 src/Orchard.Web/Content/Admin/css/autumn.css rename src/Orchard.Web/Content/Admin/{Site.css => css/base.css} (60%) delete mode 100644 src/Orchard.Web/Content/Admin/css/dark.css create mode 100644 src/Orchard.Web/Content/Admin/css/images/background_header.jpg create mode 100644 src/Orchard.Web/Content/Admin/css/images/orchardLogo.jpg create mode 100644 src/Orchard.Web/Content/Admin/css/images/tableHeaderBackground.gif create mode 100644 src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css create mode 100644 src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css delete mode 100644 src/Orchard.Web/Scripts/MicrosoftAjax.debug.js delete mode 100644 src/Orchard.Web/Scripts/MicrosoftAjax.js delete mode 100644 src/Orchard.Web/Scripts/MicrosoftMvcAjax.debug.js delete mode 100644 src/Orchard.Web/Scripts/MicrosoftMvcAjax.js create mode 100644 src/Orchard.Web/Views/Admin/Foot.aspx create mode 100644 src/Orchard.Web/Views/Admin/Head.aspx diff --git a/src/Orchard.Web/Content/Admin/css/Site.css b/src/Orchard.Web/Content/Admin/css/Site.css index c486b12cf..4dd0a73d4 100644 --- a/src/Orchard.Web/Content/Admin/css/Site.css +++ b/src/Orchard.Web/Content/Admin/css/Site.css @@ -58,7 +58,7 @@ font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill text-decoration:none; padding: 3px 8px 3px 8px; margin:20px 4px 0 4px; - background:url(../images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; border:1px solid #d2d6c6; color:#5a5b32; cursor:pointer; @@ -71,11 +71,11 @@ font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill min-width:960px; display:block; height:60px; - background:url(../images/background_header.jpg) no-repeat bottom right #8a8f7a; + background:url(images/background_header.jpg) no-repeat bottom right #8a8f7a; } #hd h1 a { - background:url(../images/orchardLogo.jpg) no-repeat; + background:url(images/orchardLogo.jpg) no-repeat; float:left; width:105px; height:60px; @@ -116,7 +116,7 @@ font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill .leftNavMod h4 { padding: 4px 4px 6px 8px; - background:url(../images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; cursor:pointer; } @@ -218,7 +218,7 @@ input[button], button, .button { padding: 0px 8px; height: 26px; margin:20px 4px 0 4px; - background:url(../images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; border:1px solid #d2d6c6; color:#5a5b32; cursor:pointer; @@ -292,7 +292,7 @@ thead, th { font-size:100%; /*13px*/ font-weight:700; text-align:left; - background:url(../images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; overflow:hidden; } diff --git a/src/Orchard.Web/Content/Admin/css/autumn.css b/src/Orchard.Web/Content/Admin/css/autumn.css deleted file mode 100644 index ed5d01feb..000000000 --- a/src/Orchard.Web/Content/Admin/css/autumn.css +++ /dev/null @@ -1,315 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ - -/*Yahoo browser reset -----------------------------------------------------------*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p, -blockquote,th,td {margin:0; padding:0; } -table { border-collapse:collapse; border-spacing:0; } -fieldset,img { border:0; } -address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; } -ol,ul { list-style:none; } -caption,th { text-align:left; } -h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; } -q:before,q:after { content:”; } -abbr,acronym { border:0; } - -/*Defaults -----------------------------------------------------------*/ -body -{ - background-color: #eff4f3; - background:url(../images/themes/autumn/bodyBackground.gif) center repeat-y; - font-size: .80em; - font-family:"Helvetica Neue", "Lucida Grande", Segoe UI, Arial, Helvetica, Verdana, sans-serif; - font-family:"trebuchet ms",helvetica,sans-serif; - text-align:center; - margin: 0; - padding: 0; - color: #2b2b2b; - min-width: 1000px; -} - -a:link -{ - color: #2b2b2b; - text-decoration: underline; -} -a:visited -{ - color: #2b2b2b; -} -a:hover -{ - color:#b1a233; - text-decoration: underline; -} -a:active -{ - color: #2b2b2b; -} - -p -{ - line-height: 1.9em; - margin: 1em .5em .5em .8em; - -} - - -/* HEADINGS -----------------------------------------------------------*/ -h1, h2, h3, h4, h5, h6{ - font-size: 1.5em; - color:#2b2b2b; - -} - -h1{ - font-size: 1.6em; - padding-bottom: 0; - margin-bottom: 0; - } - -h2{ - font-size: 1.5em; -} - - -h3{ - font-size: 1.2em; -} - -h4{ - font-size: 1.1em; -} - -h5, h6{ - font-size: 1em; -} - - -/* PRIMARY LAYOUT ELEMENTS -----------------------------------------------------------*/ - -/* Header and login -----------------------------------------------------------*/ -#header -{ - width: 100%; - height: 60px; -} - -#innerheader -{ - width: 960px; - height: 60px; - margin: 0px auto; - text-align: left; - background: url(../images/themes/autumn/headerBackground.gif) repeat-x top left #000; - -} - -#branding { - float:left; - margin:10px 0px 0px 8px; - background: url(../images/themes/autumn/leaf.gif) no-repeat top left; -} - - -#branding h1 { - font-weight:400; - font-size: 1.5em; - color:#b0a133; - border: none; - padding:2px 8px 4px 24px; - font-size: 26px !important; -} - -#login { - float:right; - color:#b0a133; - margin:21px 16px 0px 12px; - padding:4px 0px 8px 8px; -} - - -/* Main Content -----------------------------------------------------------*/ - -#wrapper { - width:960px; - margin:0 auto; - text-align:left; - /*old background:#2b3442;*/ - background:#fcfcfc; - } - -#content { - width: 740px; - float:right; - margin:42px 0px 0px 0px; -} - -#leftNav { - width: 200px; - float:left; - margin:16px 0px 0px 8px; -} - -#footer { - clear:both; - padding:4px; - overflow:hidden; -} - -/* Form elements -----------------------------------------------------------*/ - -textarea{ - width: 716px; - height: 600px; - border: 1px solid #bdb791; - background:#FFF; - padding: 5px; - } - -input.bttn { - font-size: 1.2em; - font-weight:400; - margin: 20px 0px 20px 310px; - padding:4px 12px; - color:#e2da84; - background: url(../images/themes/autumn/headerBackground.gif) repeat-x top left #000; - border: 1px solid #191919; -} - -fieldset { - margin: 20px; - padding: 10px; - border: 1px solid #bdb791; -} - -legend { - font-size: 1.1em; - padding: 2px 4px 8px 4px; -} - -label { - display: block; -} - - -/* Top navigation pane -----------------------------------------------------------*/ - -#topNavOutter -{ - width: 100%; - height: 30px; -} - -#topNavInner -{ - width: 960px; - height: 30px; - margin: 0px auto; - text-align: left; - background: url(../images/themes/autumn/TopNavBackground.gif) repeat-x bottom left #1f1f1f; - color:#FFF; -} - -#topNavInner ul -{ - margin:0; - padding:0; - list-style:none; - float:left; -} - -#topNavInner ul li -{ - float:left; - height:30px; - background:url(../images/themes/autumn/TopNavDivider.gif) no-repeat top right; -} - -#topNavInner ul li a -{ - display:block; - padding:6px 14px 2px 14px; - text-decoration:none; - float:left; - color:#e2da84; -} - -#topNavInner ul li a:hover -{ - display:block; - padding:6px 14px 2px 14px; - text-decoration:underline; - float:left; - color:#b1a233; -} - - -/* Breadcrumbs -----------------------------------------------------------*/ - -h2.crumb { - font-weight:400; - font-variant:normal; - color:#98926e; - border-bottom:1px dotted #98926e; - padding:0px 0px 4px 0px; -} - -h2.crumb a { - color:#abba39; -} - - -/* Left navigation pane -----------------------------------------------------------*/ - -.leftNavMod { - border:1px #bdb791 solid; - margin:14px 4px; - background:#FFF; - -moz-border-radius-bottomleft:4px; - -moz-border-radius-bottomright:4px; - -moz-border-radius-topleft:4px; - -moz-border-radius-topright:4px; -} - -.leftNavMod h2 { - font-size: 1.1em; - font-variant:normal; - padding: 6px 4px 6px 4px; - color:#2a2a2a; - background: url(../images/themes/autumn/sideNavBackground.gif) repeat-x top left #FFF; - border-bottom:1px solid #98926e; - cursor:pointer; - } - -/* Unorderer list links in left navigation pane -----------------------------------------------------------*/ - -.leftNavMod ul a { -display:block; -height:24px; -line-height:24px; -padding:0px 0px 0px 12px; -text-decoration:none; -text-transform:lowercase; -} - -.leftNavMod ul a:visited{ - color: #2b2b2b; -} - -.leftNavMod ul a:hover { -color: #3e4301; -background:#D3E378 !important;; -text-decoration:underline; -} diff --git a/src/Orchard.Web/Content/Admin/Site.css b/src/Orchard.Web/Content/Admin/css/base.css similarity index 60% rename from src/Orchard.Web/Content/Admin/Site.css rename to src/Orchard.Web/Content/Admin/css/base.css index 9fbb4c61c..f0312c21d 100644 --- a/src/Orchard.Web/Content/Admin/Site.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -1,73 +1,84 @@ -/* YUI Overrides -----------------------------------------------------------*/ -#doc4 {margin:10px auto;} - -#doc3 {margin: auto 0px; min-width:970px;} - -#bd {padding:14px; background-color:#f6faea; margin:0 4px;} - -#ft {text-align:center;} - -/*Defaults -----------------------------------------------------------*/ -html {height: 100%; color:#525e50; background-color:#b0b4a1; background-color:#8a8f7a;} - -body {font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; - height: 100%; - width:100%; - text-align:left; +html { + background:#8a8f7a; + color:#525e50; +} +body { color:#5a5b32; - font-size: 85%; + font-family:Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size:62.5%; /* 10px */ + min-width:96em; /* 960px */ +} +body#preview { + min-width:0; +} +#main { + font-size:1.2em; /* 12px */ } -/* ---------- Headings and defaults ---------- */ -h1,h2,h3,h4,h5,h6,legend {padding:4px 0; font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif; font-weight:normal; font-style: normal;} +/* Headings and defaults +----------------------------------------------------------*/ +h1, h2, h3, h4, h5, h6, legend { + padding:.4em 0; + font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif; + font-style: normal; + font-weight:normal; +} +h1 { font-size:2.4em; } /* 24px */ +h2 { font-size:2.1em; } /* 21px */ +h3 { font-size:1.8em; } /* 18px */ +h4 { font-size:1.6em; } /* 16px */ +h5 { font-size:1.5em; } /* 15px */ +h6 { font-size:1.4em; } /* 14px */ -h1 {font-size: 180%;} -h2 {font-size: 160%;} -h3 {font-size: 140%;} -h4 {font-size: 120%;} -h5 {font-size: 110%;} -h6 {font-size: 105%;} - -p {margin:4px;} -.smallText {font-size: 85%;} - -strong {font-weight:700;} +p { + margin:4em; +} +strong { + font-weight:700; +} /* ---------- Links ---------- */ -a, a:link, a:visited {text-decoration:none; color:#1e5d7d;} -a:hover, a:active {text-decoration:underline; color:#1e5d7d;} - -a.linkButton, a.linkButton:visited { - font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; - margin:4px 4px 4px 12px; - padding:2px; - border:1px solid #d2d6c6; - color:#5a5b32; +a, a:link, a:visited { + color:#1e5d7d; + text-decoration:none; +} +a:hover, a:active, a:focus { + color:#1e5d7d; + text-decoration:underline; } +/* todo: (heskew) see what's necessary - looks like a link styled as a button */ +a.linkButton, a.linkButton:visited { + font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + display:inline-block; + text-align:center; + text-decoration:none; + padding: 3px 8px 3px 8px; + margin:20px 4px 0 4px; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + border:1px solid #d2d6c6; + color:#5a5b32; + cursor:pointer; +} /* Header - Branding and Login ----------------------------------------------------------*/ -#hd { - min-width:960px; +#banner { + background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right; + height:60px; +} +#banner h1 { + float:left; +} +#banner h1 a { + background:url(images/orchardLogo.jpg) no-repeat; display:block; height:60px; - background:url(../images/background_header.jpg) no-repeat bottom right #8a8f7a; -} - -#hd h1 a { - background:url(../images/orchardLogo.jpg) no-repeat; - float:left; + margin:-10px 0 0 18px; + text-indent:-9999px; width:105px; - height:60px; - position:relative; - top:-4px; - margin:0 0 -14px 18px; - z-index:0; - } +} #hd a, #hd a:visited, #hd a:active { display:block; @@ -100,7 +111,7 @@ a.linkButton, a.linkButton:visited { .leftNavMod h4 { padding: 4px 4px 6px 8px; - background:url(../images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; cursor:pointer; } @@ -147,7 +158,7 @@ div.confirmation, div.warning, div.critical { .critical { background:#e68585; border:1px solid #990808; - color:#990808; + color:#fff; } /* Forms @@ -178,7 +189,7 @@ legend { color:#525e50; } -select, textarea, .inputText, .button{ +select, textarea, #PublishLaterDate, .inputText{ font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:102%; margin:4px 4px 4px 0; @@ -188,7 +199,7 @@ select, textarea, .inputText, .button{ } textarea { - width:90%; + width:80%; height:260px; } @@ -199,16 +210,24 @@ margin:0 6px 0 0; input[button], button, .button { font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; text-align:center; - padding:2px 6px; - margin:20px 0 0 0; + padding: 0px 8px; + height: 26px; + margin:20px 4px 0 4px; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + border:1px solid #d2d6c6; + color:#5a5b32; + cursor:pointer; } +.buttonFocus {color:#f6faea; border:1px solid #666d51; background:#8a8f7a;} + + #permalink{ width:200px; } .inputText { - width:90%; + width:80%; } .inputTextLarge { @@ -220,6 +239,10 @@ input[button], button, .button { margin:-4px 0 8px 0; } + +#Revision_Slug{ + width:245px; +} /* ---------- Sidebar forms ---------- */ .sideBar fieldset {margin:0px; border:none;} @@ -251,6 +274,7 @@ table { width: 100%; border-spacing: 0px; border:1px solid #B0B083; + background:#fff; } tbody @@ -260,10 +284,10 @@ tbody } thead, th { - font-size:104%; + font-size:100%; /*13px*/ font-weight:700; text-align:left; - background:url(../images/tableHeaderBackground.gif) repeat-x top left #dddfcb; + background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; overflow:hidden; } @@ -318,6 +342,24 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho text-decoration: none; } +/* Miscellaneous; +----------------------------------------------------------*/ + +.templateThumbnail{ + width: 124px; + height: 144px; + border:1px solid #000; + margin: 4px 4px 20px 16px; +} + +.previewImage { + width:70%; + height:70%; + border:1px solid #525e50; +} + + + /* Extensions; ----------------------------------------------------------*/ @@ -343,7 +385,8 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho .separator {border-bottom:1px dashed #E4E7DC; margin-bottom:8px; padding-bottom:2px;} -.roundCorners { +/*TODO - Remove roundCorners class*/ +table, textarea, #bd, .button, .inputText, .inputTextLarge, .inputTextPermalink, .linkButton, .leftNavMod, div.confirmation, div.warning, div.critical, .roundCorners { -moz-border-radius-bottomleft:4px; -moz-border-radius-bottomright:4px; @@ -355,3 +398,11 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho -webkit-border-bottom-left-radius: 4px; -webkit-border-bottom-right-radius: 4px; } + + +/* TinyMCE Overides +----------------------------------------------------------*/ +.defaultSkin table.mceLayout { + margin:0 0 20px 0 !important; + width:90% !important; +} diff --git a/src/Orchard.Web/Content/Admin/css/dark.css b/src/Orchard.Web/Content/Admin/css/dark.css deleted file mode 100644 index b84bc043f..000000000 --- a/src/Orchard.Web/Content/Admin/css/dark.css +++ /dev/null @@ -1,316 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ - -/*Yahoo browser reset -----------------------------------------------------------*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p, -blockquote,th,td {margin:0; padding:0; } -table { border-collapse:collapse; border-spacing:0; } -fieldset,img { border:0; } -address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; } -ol,ul { list-style:none; } -caption,th { text-align:left; } -h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; } -q:before,q:after { content:”; } -abbr,acronym { border:0; } - -/*Defaults -----------------------------------------------------------*/ -body -{ - background: url(../images/themes/dark/bodyBackground.gif) repeat-x top left #303a49; - font-size: .80em; - font-family:"Helvetica Neue", "Lucida Grande", Segoe UI, Arial, Helvetica, Verdana, sans-serif; - text-align:center; - margin: 0; - padding: 0; - color: #f5f5f5; - min-width: 1000px; -} - -a:link -{ - color: #bababa; - text-decoration: underline; -} -a:visited -{ - color: #bababa; -} -a:hover -{ - color:#ff7e00; - text-decoration:underline; -} -a:active -{ - color: #bababa; -} - -p -{ - line-height: 1.9em; - margin: 1em .5em .5em .8em; - -} - - -/* HEADINGS -----------------------------------------------------------*/ -h1, h2, h3, h4, h5, h6{ - font-size: 1.5em; - color:#f5f5f5; - -} - -h1{ - font-size: 1.6em; - padding-bottom: 0; - margin-bottom: 0; - } - -h2{ - font-size: 1.5em; -} - - -h3{ - font-size: 1.2em; -} - -h4{ - font-size: 1.1em; -} - -h5, h6{ - font-size: 1em; -} - - -/* PRIMARY LAYOUT ELEMENTS -----------------------------------------------------------*/ - -/* Header and login -----------------------------------------------------------*/ -#header -{ - width: 100%; - height: 90px; -} - -#innerheader -{ - width: 960px; - height: 90px; - margin: 0px auto; - text-align: left; - background: url(../images/themes/dark/headerBackground.gif) repeat-x top left #000; - border-left:1px #38383d solid; - border-right:1px #696969 solid; -} - -#branding { - float:left; - margin:20px 0px 0px 0px; - padding:4px 8px 8px 16px; -} - - -#branding h1 { - font-weight:800; - font-size: 1.6em; - border: none; - font-size: 28px !important; -} - -#login { - float:right; - margin:32px 16px 0px 12px; - padding:4px 0px 8px 8px; -} - - -/* Main Content -----------------------------------------------------------*/ - -#wrapper { - width:960px; - margin:0 auto; - text-align:left; - /*old background:#2b3442;*/ - background:#262d31; - border-left:1px #364253 solid; - border-bottom:1px #364253 solid; - border-right:1px #364253 solid; - } - -#content { - width: 740px; - float:right; - margin:42px 0px 0px 0px; -} - -#leftNav { - width: 200px; - float:left; - margin:16px 0px 0px 8px; -} - -#footer { - clear:both; - padding:4px; - overflow:hidden; -} - -/* Form elements -----------------------------------------------------------*/ - -textarea{ - width: 716px; - height: 600px; - border: 1px solid #364253; - background:#f5f5f5; - padding: 5px; - } - -input.bttn { - font-size: 1.2em; - font-weight:400; - margin: 20px 0px 20px 310px; - padding:4px 12px; - color:#abba39; - background: url(../images/themes/dark/headerBackground.gif) repeat-x top left #000; - border: 1px solid #191919; -} - -fieldset { - margin: 20px; - padding: 10px; - border: 1px solid #323b40; -} - -legend { - font-size: 1.1em; - padding: 2px 4px 8px 4px; -} - -label { - display: block; -} - - -/* Top navigation pane -----------------------------------------------------------*/ - -#topNavOutter -{ - width: 100%; - height: 30px; -} - -#topNavInner -{ - width: 960px; - height: 30px; - margin: 0px auto; - text-align: left; - background: url(../images/themes/dark/TopNavBackground.gif) repeat-x bottom left #000; - border-left:1px #000 solid; - border-right:1px #000 solid; - color:#FFF; -} - -#topNavInner ul -{ - margin:0; - padding:0; - list-style:none; - float:left; -} - -#topNavInner ul li -{ - float:left; - height:30px; - background:url(../images/themes/dark/TopNavDivider.gif) no-repeat top right; -} - -#topNavInner ul li a -{ - display:block; - padding:6px 14px 2px 14px; - text-decoration:none; - float:left; - color:#f5f5f5; -} - -#topNavInner ul li a:hover -{ - display:block; - padding:6px 14px 2px 14px; - text-decoration:underline; - float:left; - color:#ff7e00; -} - - -/* Breadcrumbs -----------------------------------------------------------*/ - -h2.crumb { - font-weight:400; - font-variant:normal; - color:#dcdcde; - border-bottom:1px dotted #364253; - padding:0px 0px 4px 0px; -} - -h2.crumb a { - color:#abba39; -} - - -/* Left navigation pane -----------------------------------------------------------*/ - -.leftNavMod { - border:1px #191919 solid; - margin:14px 4px; - background:#dcdcde; - -moz-border-radius-bottomleft:4px; - -moz-border-radius-bottomright:4px; - -moz-border-radius-topleft:4px; - -moz-border-radius-topright:4px; -} - -.leftNavMod h2 { - font-size: 1.1em; - font-variant:normal; - padding: 4px; - color:#bababa; - background: url(../images/themes/dark/headerBackground.gif) repeat-x top left #000; - border-bottom:1px solid #212121; - cursor:pointer; - } - -/* Unorderer list links in left navigation pane -----------------------------------------------------------*/ - -.leftNavMod ul a { - display:block; - height:24px; - color:#3a546e; - line-height:24px; - padding:0px 0px 0px 12px; - text-decoration:none; -} - -.leftNavMod ul a:visited{ - color:#3a546e; -} - -.leftNavMod ul a:hover { - color: #ff7e00; - background:#5c6165 !important;; - text-decoration:underline; -} diff --git a/src/Orchard.Web/Content/Admin/css/images/background_header.jpg b/src/Orchard.Web/Content/Admin/css/images/background_header.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4775b434c9be3fae911789630ec60768a1a95763 GIT binary patch literal 2700 zcma)8c{tST7yr(TB}{5$6hh3%GO~{Oz~DEkr@m+_0MxpBF-dw>7l&-=X3InO!oS>E%!?{m)Pr_E7d_ep{U0RVvk zfU>oK&3OQ35!{<3a3UCppV-jbV(=3n6r0i*Q4!bL5qbeyX2#z?Gzs-nFrMf2Bai`*^CX`ZQI-0SbZq5+Fod{mTh1`JG0o z69pSb@61^zPnM8hhZ>(joq1BrP!6oSV}3{zcN?0x=89E)HT*bo?%&9Qf)bO>yQa-c zc&V16>9r&SQC8U-F}mC2N(l{PDl_FZ*3yJg>*>m}7Ivnfm9+U5$O8Mg)Wfeo%5YPP zAJnBR3Pf79oc%=_X;ynJKo45_m=j1_@ti_WRw2YRElrj4z57+5OpPzNqFV$NJNHy+ zEzUw?a&W*)?$kSO!S?kPl|*27f2RqgxTR(Xz81oIY_$0qswar&pqE=Z!>h*rcsj50 zcbT@b#*dA9V^#+dvn~(YBXp@~d0bY{$wBe7%2UazsZki}y%)sYTGH6MQuh6eT|b_q z$R53_YIg{hR^P@u>@%>!@#>?ruJZ`ba4`=eze-;vccuH`DK)9 zsz^QD;fz1XsGE;@v2prAf|B=$XY8tK*9la~rSc?AX`*Z-MyaArbAN@Wc6yzF3qf2` zznqZYde-$n$vAe7csQcwUX= zg}8%QpXt`#bU$n`S@ob^TUN}gyVo61K01eW4{;_~0PZw(noF@MEswi)l{0be%yI4& z+Svn7d8_ZIOa6XB_^H+fYB(y9UwkCr#t!~0#C9(^{R8s;=>Bh#Bm(=_x0!z#^NeyV%}<5g&+yI z7UrE9)coi`T7`*xH&b$KAng7opcC`Q<-Bi0feIs=0BsXMtcF{8@sAd-yMC#fya9a( zITc;YB!70xST{q2cCS(F+qqBTp_kTuvpeTpPld#6z%!H&uKSb7EwV{zn$8AVK0iA0 zN!GiJDPqdCpQ*N#|dXGhGrR9YCR9@6Zw{ox;22BG{w-pd}kM-I+NV*G0@&w_T_sjuP<{+ot@wI^@i=bfbwP!nF%u%k{N| zs?L6ul;*jlX(L>C9o>>@<2>_bm?O8R$u2a`RkgoH3!!ku@IzM*WSND;j(8!0kI9gRriBd`JJQ-u#SxQ)EgPVLC}oTQIV54%(n-pU`@pl`Tot%Yip{86Lu_=#U`6cqg?e$eW+Jm!I2 z%YI5}Qt{g?QNvPy!YL4niv2*hsA@I!@X9sKLz8g~(Kal@RFv*QqG>bpv3o1(&)Z!@ zrte8BJs`KEmT^GDd>yTFCSDBP$}X&(=T>E=J0)pY!xbNqzul$pUYkRv){BkT^(KKW z-LHF@2+MnF&Uo3&+>h_LMMcEu&MBomT5=Cp3dm-1B9rGAlE;t4Xi@r5!?xy*RBA@#51I@50Qd11G>tZgq!i(;dy;-@*b%s)ag?H#B*++n_f*-%Dje{HI3olmJ`fYLLTs@R4kRw3^o|c zknrP)%<#;|8?F>u3VkdLbOisP2%k8{A#%G`9;jze}$gHL*6 ql{Y^(gv%Z3tlk7k3HSqAw!9M}2k(uBC literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Content/Admin/css/images/orchardLogo.jpg b/src/Orchard.Web/Content/Admin/css/images/orchardLogo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e378d549f9641a7fce52dde62814d720974382c7 GIT binary patch literal 2646 zcma)8cTm$w8~!Ds9V#XCCJG3G0unF?0!r^-0Fh9S5-<=t5m7)6!B9f)(ZJC|5u^%A zi&CU1pi&Z=h!`{hDWV8Rj=QBW8F4>7ry6rf4@CO4x;>pZ_dNYEj4iw0~6thr1d zn3w#T>h`U6%jQ%U!`46#BsJL;CJf8R8@UKfcJAC~0_k_FvDPkKoy6*6ZAvk1oJq0? zdR1TS+;FNl#lLeweo-zMrC_!dz2$vur>47IbjY~+vt- z&4{d5Z-srx?+?^3EhBY2rz*-mQM+!Fdiqs7OeP}_i3UddGf|Pvf^VoogcB!%#ITLl z%|E@>oHbXiIwDyP@IQT`ZsneZtu|6S6!S< zTE0z4H`*Mp$pcLhE1&L&LNa8vp!s{&aEkmMjHB0r%A@E>b#s$r&?(^x4CKKYYYtaz ztdrG1fs_O>D&9FCDh5Xl5;jO-T$7aZh|SGrXtFFdG(= z+)N2>f)}F3WDDI_26ZQ0(Y->V5v2l9r~$%`)-jqdQKy?Q**fzyDa8=-X!>bcb{+Ym zB>Kz)Q;Vl;&gRev+Gu+!?}rM_BxUAo zSZ(<{SDIAHvlZ-`UZ!yb$Ome4Y0hIgB&m*4BK5D4^GTy=V2gos3PqD?|Gc=_XHU|q?sZp`S_lY7m zx3+`SSV`VX`lsC7WcgH_sujAD7vv{G%uK~}?U;an*Ze~4*X<5u@SN z^sW>BSbg*IgE{O`&AfTFZ4IbcCt)it%JQSLv};*hhhHe8Wl!4iCdH|_(1~mwYXxf! zUHb3kmZv0W)Qp_K7}>wsl&mZ+DR6(Kp)K0hUUk zEf?i2+T9c)XBrF99?pseaJIATs0(z1Jn4n(!3+~Qz}Z0U$ihLW-{MBj>7W*SAvIy= zv~}cFyKo}CYdWBly{LxWZp>Nr#Q=}fO(GU_Q=WTC4Dbi@qH5BRb z0?BQ9SAvv4KADtffRs~5YQ$X$fHkLg+&tLxEbqppbWcqC1oP5D8@yMWvB7f|qvpEc;fyRi{Qu^y5uyMfnjNq+aQQSt>o$01?Jp3ck?w>s&a(YQ)ym)q9wPtZYEa6#q z;5j%oT_if4Dq&uwLjdHR)TkE?Zyru&v!TrOJ z1c=m^27bD=d-0t_Yw^aJtn=4q?#NrTD9Q|r`O@z@IJI&$4y}Ik(o_xfc?`bDpZ-zD z>NJZFDlTlN@9{C7p_Pq-v7!a4N0*`OSmQG0 zV6Pnxc8ykeS(>3V_zNR7uu51#XF_GRoETbH*u=;T+oQo96qQpuN@I!3RVK^7nIC>l z_{B9st*46ULE%#Jshmp8$#c&Iczo~i;N$DiZs)@p?6-#_?psz4Xzgm%+#1$$c@-aY zfs^r8jiDs#>?BW@y^TFCQPSk}E1qsv@VXI!M9O@9bmMGx>cmcFMp`9uaw;%C)xPz+ zvdm4#y8}N){SGwWxD)X$q2jNc7p5o;E>Kh`%WJI4f^9$)=8e$hl*;?L6T-#k-wJ*v zhVMKW>W)jx{W|?{Hc-;RdpmRm`SHvt-2#N1s;A4?*_q1q5R27-qefo6ntgiyvH3G+ z3RAZQuJ-0R53i)4MsT2>X9;=5oX|*8^7fYtrT%H87^(f(#QioA1e6J!OWLO$@*Gl$ z<1C0vu~K1+?qdErz)xEom79y&tp|(Iyg%Bw{kz*F<8|sF)W9|Ncak+RMr7?PAfaXc qA8jI6z~5u)t#Js$AGR@<`M+~ijwBQrL-PJzzx-c0^Y;?MocSHfKbwvK literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Content/Admin/css/images/tableHeaderBackground.gif b/src/Orchard.Web/Content/Admin/css/images/tableHeaderBackground.gif new file mode 100644 index 0000000000000000000000000000000000000000..2a92ab80cf1c96231fea5c97c9e053e750c4db4a GIT binary patch literal 500 zcmdUsM^eH7002X8_TCkH!QMdZ2OV$v1b?D_MFe}tf(;c?fh45UAtV8R;LXurxQ9LO z%&u>&*&W*|U=xr5pzsw#LMORA8Bc<#3?>)2FmaX1MS}1F7CDEpV+cKDxEF?hjU|FY z{8K3kN`cRcxTG*4`~r`9N%}rQUh}bcit$Cr8!qM#B5p}xLBvh5J|PhZz%G)02tcl^ zNQhFDpzc`yjT8LoY>1$|eEdU_8Jc^}%e1Vp$uycsL4~3KBAzJon9hbpiAtss7(2?# z6o`5P&^{VIQ;Iwuy`|Zw5Pq3R!D#pt_@7w6wSVEZU;jP<3|l+E-bBShrA{~6T5TI~ z%=D<$-Bkv|^ng}7HoG#e(Uf(R4>dIR_m!3mFSR#Lb=LI`)-E>H>-EbuCe!??N@X_N REta{-wict&+U48@oIgmhvM~Sv literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css b/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css new file mode 100644 index 000000000..ccc5479ea --- /dev/null +++ b/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css @@ -0,0 +1,126 @@ +/* +Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 3.0.0 +build: 1549 +*/ +/* + TODO will need to remove settings on HTML since we can't namespace it. + TODO with the prefix, should I group by selector or property for weight savings? +*/ +html{ + color:#000; + background:#FFF; +} +/* + TODO remove settings on BODY since we can't namespace it. +*/ +/* + TODO test putting a class on HEAD. + - Fails on FF. +*/ +body, +div, +dl, +dt, +dd, +ul, +ol, +li, +h1, +h2, +h3, +h4, +h5, +h6, +pre, +code, +form, +fieldset, +legend, +input, +textarea, +p, +blockquote, +th, +td { + margin:0; + padding:0; +} +table { + border-collapse:collapse; + border-spacing:0; +} +fieldset, +img { + border:0; +} +/* + TODO think about hanlding inheritence differently, maybe letting IE6 fail a bit... +*/ +address, +caption, +cite, +code, +dfn, +em, +strong, +th, +var { + font-style:normal; + font-weight:normal; +} +/* + TODO Figure out where this list-style rule is best set. Hedger has a request to investigate. +*/ +li { + list-style:none; +} + +caption, +th { + text-align:left; +} +h1, +h2, +h3, +h4, +h5, +h6 { + font-size:100%; + font-weight:normal; +} +q:before, +q:after { + content:''; +} +abbr, +acronym { + border:0; + font-variant:normal; +} +/* to preserve line-height and selector appearance */ +sup { + vertical-align:text-top; +} +sub { + vertical-align:text-bottom; +} +input, +textarea, +select { + font-family:inherit; + font-size:inherit; + font-weight:inherit; +} +/*to enable resizing for IE*/ +input, +textarea, +select { + *font-size:100%; +} +/*because legend doesn't inherit in IE */ +legend { + color:#000; +} \ No newline at end of file diff --git a/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css b/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css new file mode 100644 index 000000000..fb264a0c5 --- /dev/null +++ b/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css @@ -0,0 +1,8 @@ +/* +Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 3.0.0 +build: 1549 +*/ +html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;} \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 30429cf6b..ff42546ef 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -96,10 +96,6 @@ - - - - @@ -158,15 +154,18 @@ - - - - + + + + + + + @@ -175,6 +174,8 @@ + + diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx index 8ea185d2c..d64e95fee 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx @@ -3,21 +3,21 @@ <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("Header"); %>
-

<%=T("Edit Page")%>

-

<%=T("about setting up a page")%>

+

<%=_Encoded("Edit Page")%>

+

<%=_Encoded("about setting up a page")%>

<%=Html.ValidationSummary() %>
<%using (Html.BeginForm()) {%>
-

<%= T("Page Content") %>

+

<%=_Encoded("Page Content") %>

    <%=Html.EditorFor(m => m.Revision.Title, "inputTextLarge")%> <%=Html.EditorFor(m => m.Revision.Slug, "inputTextPermalink")%> <%foreach (ContentItem content in Model.Revision.Contents) {%> + <%=_Encoded("Zone Name")%>: <%= content.ZoneName %> <%if (Model.Template != null && Model.Template.Zones.Contains(content.ZoneName) == false) {%>
    These contents are assigned to a zone that does not exist in the current template. Please delete it or copy it to another zone.
    <%}%> @@ -36,7 +36,7 @@
<%-- #content --%> + <%-- Navigation --%> + +
<%-- #main --%> + + \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Head.aspx b/src/Orchard.Web/Views/Admin/Head.aspx new file mode 100644 index 000000000..a0bb5d6ec --- /dev/null +++ b/src/Orchard.Web/Views/Admin/Head.aspx @@ -0,0 +1,35 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels" %> +<%@ Import Namespace="Orchard.Mvc.Html" +%><%-- +todo: (heskew) rework how/what pages are assembled when we get into theming --%> + + + + <%-- todo: (heskew) get this from the menu system + --%>Admin :: Orchard + " rel="stylesheet" type="text/css" /> + <%-- todo: (heskew) same as scripts [below] + --%>" rel="stylesheet" type="text/css" /> + <%-- todo: (heskew) this should come from the admin "page" (partial) + todo: (heskew) should have at the minimum something like, say, includeScript(scriptName[, releaseScriptName], scriptPath[, releaseScriptPath]) + --%> + <%-- todo: (heskew) this should come from the admin "page" (partial) + --%> + + + + +
+
+ <% Html.RenderPartial("Messages", Model.Messages); %> \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Header.aspx b/src/Orchard.Web/Views/Admin/Header.aspx index 4c880ac66..2b1dd6984 100644 --- a/src/Orchard.Web/Views/Admin/Header.aspx +++ b/src/Orchard.Web/Views/Admin/Header.aspx @@ -5,39 +5,36 @@ Admin :: Orchard + <%-- todo: (heskew) same as scripts [below] --%> " rel="stylesheet" type="text/css" /> - + <%-- todo: (heskew) this should come from the admin "page" (partial) --%> + <%-- todo: (heskew) should have at the minimum something like, say, includeScript(scriptName[, releaseScriptName], scriptPath[, releaseScriptPath]) --%> + + <%-- todo: (heskew) this should come from the admin "page" (partial) --%> - + + -
-