-
+
<%=Html.EditorFor(svm => svm.DatabaseConnectionString)%>
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_content.jpg b/src/Orchard.Web/Themes/SafeMode/Content/Images/background_content.jpg
deleted file mode 100644
index f8961ab9f..000000000
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_content.jpg and /dev/null differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_footer.jpg b/src/Orchard.Web/Themes/SafeMode/Content/Images/background_footer.jpg
deleted file mode 100644
index 42eedca47..000000000
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_footer.jpg and /dev/null differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_module.gif b/src/Orchard.Web/Themes/SafeMode/Content/Images/background_module.gif
deleted file mode 100644
index ea5341ea0..000000000
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_module.gif and /dev/null differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_page.jpg b/src/Orchard.Web/Themes/SafeMode/Content/Images/background_page.jpg
deleted file mode 100644
index 0d89bf343..000000000
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_page.jpg and /dev/null differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_pageTop.gif b/src/Orchard.Web/Themes/SafeMode/Content/Images/background_pageTop.gif
deleted file mode 100644
index 9fc2003d2..000000000
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/Images/background_pageTop.gif and /dev/null differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Images/orchardLogo.jpg b/src/Orchard.Web/Themes/SafeMode/Content/Images/orchardLogo.jpg
deleted file mode 100644
index 92d6fe033..000000000
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/Images/orchardLogo.jpg and /dev/null differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/images/backgroundHeader.gif b/src/Orchard.Web/Themes/SafeMode/Styles/images/backgroundHeader.gif
new file mode 100644
index 000000000..69fff93e1
Binary files /dev/null and b/src/Orchard.Web/Themes/SafeMode/Styles/images/backgroundHeader.gif differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/images/backgroundVines.gif b/src/Orchard.Web/Themes/SafeMode/Styles/images/backgroundVines.gif
new file mode 100644
index 000000000..8767a23ae
Binary files /dev/null and b/src/Orchard.Web/Themes/SafeMode/Styles/images/backgroundVines.gif differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/images/orchardLogo.gif b/src/Orchard.Web/Themes/SafeMode/Styles/images/orchardLogo.gif
new file mode 100644
index 000000000..7496b50f6
Binary files /dev/null and b/src/Orchard.Web/Themes/SafeMode/Styles/images/orchardLogo.gif differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/site.css b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
index 205f863b1..63fa85419 100644
--- a/src/Orchard.Web/Themes/SafeMode/Styles/site.css
+++ b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
@@ -1,7 +1,6 @@
-/* CSS Document */
-
-/*Yahoo browser reset
+/*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; }
@@ -10,270 +9,119 @@ address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:
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; }
+q:before,q:after {content:'';}
+abbr,acronym { border:0;}
/*Defaults
----------------------------------------------------------*/
+
html {height: 100%;}
-body {font: normal 100% 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;
- background:url(../Content/Images/background_pageTop.gif) top left repeat-x #f6faea;
+body {
+ font: normal 100% Segoe UI,Trebuchet,Arial,Sans-Serif;
height: 100%;
text-align:left;
- color:#525e50;
+ color:#333;
}
/* ---------- 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;}
-h1 {font-size: 200%;}
-h2 {font-size: 170%;}
-h3 {font-size: 150%;}
+h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal;}
+
+h1 {font-size: 180%;}
+h2 {font-size: 160%;}
+h3 {font-size: 145%;}
h4 {font-size: 130%;}
h5 {font-size: 120%;}
-h6 {font-size: 110%;}
-
-p {line-height:20px; padding:2px 8px;}
-
-ul {list-style:circle; list-style-position:inside; line-height:22px;}
-
-/* ---------- links ---------- */
-a, a:visited {color:#006699;}
-a:hover {text-decoration: underline;}
-a:active {color:#006699;}
-
-#siteInfoContent a, #siteInfoContent a:visited {text-decoration: none;}
-#siteInfoContent a:hover {text-decoration: underline;}
-#siteInfoContent a:active {text-decoration: none;}
+h6 {font-size: 105%;}
-/* Forms
-----------------------------------------------------------*/
-fieldset {margin:10px; padding:10px; border:1px solid #d2d6c6;}
-
-fieldset label {display: block;}
-
-legend {font-size:104%; color:#525e50; padding: 2px 4px 8px 4px;}
-
-.inputText {font-size:102%; margin:4px; padding:2px; border:1px solid #d2d6c6; color:#555; width:200px;}
-
-select {font-size:102%; margin:4px; padding:2px; border:1px solid #d2d6c6; color:#555; width:200px;}
-
-.button {text-align:center; padding:2px 6px; color:#27320a;}
-
-/* Table
-----------------------------------------------------------*/
-
-table
-{
- border: solid 1px #e8eef4;
- border-collapse: collapse;
+#header {
+ background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right;
+ width:100%;
+ height:50px;
+ margin-bottom:40px;
}
-table td
-{
- padding: 5px;
- border: solid 1px #e8eef4;
-}
-
-table th
-{
- padding: 6px 5px;
- text-align: left;
- background-color: #e8eef4;
- border: solid 1px #e8eef4;
-}
-
-
-/*Outer layout
-----------------------------------------------------------*/
-
-/* -- Wraps the whole page so footer can be pushed down to the bottom. html and body both need to have height set to 100% for this to work -- */
-
-#wrapper {
-background:transparent url(../Content/Images/background_page.jpg) no-repeat center top;
-height:auto;
-min-height:100%;
-position:relative;
-voice-family:inherit;
-}
-
-html>body #wrapper {height: auto;}
-
-
-#branding {
- width:960px;
+#branding{
+ background:url(images/orchardLogo.gif) no-repeat;
display:block;
- height:90px;
- margin:0em auto;
-}
-
-#branding h1 a {
- background:url(../Content/Images/orchardLogo.jpg) no-repeat scroll 0 0;
- float:left;
- display:block;
- width:216px;
- height:90px;
- position:relative;
- top:-4px;
- margin-bottom:-4px;
- z-index:0;
-}
-
-#logindisplay {
- float:right;
- margin:28px 8px 0 0;
- color: #c6ccb4;
- color: #e7ebdb;
-}
-
-#logindisplay a {
- color: #e7ebdb;
-
-}
-
-#menucontainer{
- width:960px;
- display:block;
- height:44px;
- margin:0em auto;
- clear:both;
-}
-
-#content {
- background:url(../Content/Images/background_content.jpg) no-repeat center top #FFF;
- height:100%;
- margin:0px auto;
- padding:0px;
- width:960px;
-}
-
-#contentMain {
- float:left;
- padding:14px 10px 10px 16px;
- width:560px;
-}
-
-#contentFull {
- padding:14px 10px 10px 16px;
-}
-
-#contentSub {
- float:right;
- padding:24px 10px 10px 10px;
- width:345px;
- background:url(../Content/Images/background_module.gif) no-repeat bottom right;
-}
-
-#siteInfo {
- bottom: 0;
- width:100%;
-}
-
-#siteInfoContent {
- margin:0 auto;
- background:url(../Content/Images/background_footer.jpg) no-repeat center top;
- height:120px;
- width:960px;
- vertical-align:bottom;
- text-align:center;
+ height:60px;
+ margin:0 0 0 20px;;
}
-#siteInfoContent ul{
- padding:80px 0 0 0;
- list-style:none;
+#branding h1{
+ font-size: 140%;
+ color:#fff;
+ padding:8px 0 0 40px;
}
-#siteInfoContent ul li {
- display:inline;
- margin:0px;
- padding: 0 8px;
+
+#main {
+margin:0 auto;
+width:600px;
}
-/* left column containers
-----------------------------------------------------------*/
-#contentMain h2 {padding:4px 0 12px 0;}
-#contentFull h2 {padding:4px 0 12px 0;}
-
-#contentFull h4 {border-bottom:1px dashed #e4e7dc; padding:4px 0 12px 0;margin-bottom:5px;}
-
-.moduleContentMain {margin:0 0 22px 0; overflow:auto;}
-
-.moduleContentFull {margin:0 0 5px 0; overflow:auto;}
-
-.moduleContentMain img.left {padding:0 6px 0 0; float:left;}
-
-/* right column containers
+/* Forms
----------------------------------------------------------*/
-#contentSub h6 {border-bottom:1px dashed #e4e7dc;}
-
-#contentFull h6 {font-style:italic;}
-
-.navSub, .moduleSub {margin:0 0 12px 0; padding:8px 0 6px 0;}
-
-
-/* Top navigation pane
-----------------------------------------------------------*/
-
-#menucontainer ul{
- margin:0;
- padding:0;
- list-style:none;
- float:left;
+input[type="text"], #password {
+ border:1px solid #DDDEDF;
+ display: block;
}
-#menucontainer ul li {
- float:left;
- margin:0 8px;
+form {
+ border:1px solid #DDDEDF;
+ padding:10px 0;
+ background:transparent url(images/backgroundVines.gif) no-repeat right bottom;
}
-#menucontainer ul li a, #menucontainer ul li a:visited, #menucontainer ul li a:active {
- display:block;
- padding:12px 12px 10px 12px;
- color: #e2e4dd;
- font-size:104%;
- text-decoration: none;
+fieldset div {
+ margin:20px 20px 32px 20px;
}
+
+legend {
+ font-size: 110%;
+ font-weight:500;
+ border:none;
+ margin:0 20px;
+ }
+label {
+ display:block;
+ }
-#menucontainer ul li a:hover {
- color:#ffea9b;
+label.forcheckbox {
+ display:inline;
+ }
+
+input[type="text"], #password {
+ border-color:#ccc;
+ padding:4px;
+ width:98%;
+ }
+
+button, .button, .button:visited {
+ font-size: 102%;
+ background:#4687ad;
+ border:1px solid #8f8f8f;
+ color:#fff;
+ font-weight:600;
+ cursor:pointer;
+ text-align:center;
+ margin:0 0 20px 20px;
+ padding:4px 14px;
+}
+
+button:hover, .button:hover,
+button:active, .button:active,
+button:focus, .button:focus {
+ background:#ffac40;
+ border-color:#bb8b2d;
+ color:#fff;
+ text-decoration:none;
}
-
-#menucontainer ul li.On {background:url(../Content/Images/tabOn.gif) no-repeat bottom center;}
-
-/* BlogStyles
-----------------------------------------------------------*/
-
-ul.blogs, ul.blogPosts {list-style:none;}
-
-
-/* Miscellaneous
-----------------------------------------------------------*/
-
-.floatLeft {float: left;} /*Use this class to float anything to the left*/
-
-.floatRight {float: right;} /*Use this class to float anything to the right*/
-
-.alignRight {text-align: right;}
-
-.Inline {display: inline;}
-
-.center {margin:0 auto;} /*Center*/
-
-.clearLayout {clear:both;} /*Use this class clear layout*/
-
-.disabled {color:#CCC;}
-
-.topSpacer {margin-top: 30px;}
-
-.bottomSpacer {margin-bottom: 20px;}
-
-.displayText {display:none;}
-
-strong { font-weight:bold; }
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Footer.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Footer.ascx
deleted file mode 100644
index e4a973ee5..000000000
--- a/src/Orchard.Web/Themes/SafeMode/Views/Footer.ascx
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-
-
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
index 4993abc38..36ade10cd 100644
--- a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
@@ -1,52 +1,13 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl
" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<%
+<% //todo: (heskew) this should really be using the IResourceManager if it's to be a theme
var siteCss = ResolveUrl("../Styles/site.css");
Model.Zones.AddAction("head:styles", html =>
html.ViewContext.Writer.Write(@"")); %>
-
-
-
-
-
-
- -
- <%--Main Content--%>
- <%Html.ZoneBody("content");%>
-
-
- <%--Right sidebar--%>
-
- -
-
- Sidebar
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor
- vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur
- blandit leo nec magna dictum vitae mollis tellus gravida. Morbi non condimentum
- neque. Suspendisse commodo condimentum feugiat. Class aptent taciti sociosqu ad
- litora torquent per conubia nostra, per inceptos himenaeos.
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor
- vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur
- blandit leo nec magna dictum vitae mollis tellus gravida. Morbi non condimentum
- neque. Suspendisse commodo condimentum feugiat. Class aptent taciti sociosqu ad
- litora torquent per conubia nostra, per inceptos himenaeos.
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor
- vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur
- blandit leo nec magna dictum vitae mollis tellus gravida. Morbi non condimentum
- neque. Suspendisse commodo condimentum feugiat. Class aptent taciti sociosqu ad
- litora torquent per conubia nostra, per inceptos himenaeos.
-
-
-
-
-
- <%-- End Content --%>
+
+
+ <%Html.ZoneBody("content"); %>
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Menu.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Menu.ascx
deleted file mode 100644
index dcadd4626..000000000
--- a/src/Orchard.Web/Themes/SafeMode/Views/Menu.ascx
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-
\ No newline at end of file