lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Cleaning up a few things

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045087
This commit is contained in:
ErikPorter
2010-01-07 01:35:10 +00:00
parent 6d9f911a9e
commit 4b03080e68
13 changed files with 1 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

325
src/Orchard.Web/Content/Site2.css
View File

@@ -1,325 +0,0 @@
/*----------------------------------------------------------
The base color for this template is #696969. If you'd like
to use a different color start by replacing all instances of
#696969 with your new color.
----------------------------------------------------------*/
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; }
body
{
background-color: #edebd5;
font-size: .80em;
font-family:"Helvetica Neue", "Lucida Grande", Segoe UI, Arial, Helvetica, Verdana, sans-serif;
margin: 0;
padding: 0;
color: #696969;
}
a:link
{
color: #034af3;
text-decoration: underline;
}
a:visited
{
color: #505abc;
}
a:hover
{
color: #1d60ff;
text-decoration: none;
}
a:active
{
color: #12eb87;
}
p
{
line-height: 1.9em;
margin: 1em .5em .5em .8em;
}
/* HEADINGS
----------------------------------------------------------*/
h1, h2, h3, h4, h5, h6
{
font-size: 1.5em;
font-family:Georgia,serif;
color:#666;
font-variant: small-caps; text-transform: none; font-weight: 200; margin-bottom: 0;
}
h1
{
font-size: 1.6em;
padding-bottom: 0;
margin-bottom: 0;
}
h2
{
font-size: 1.5em;
padding: 10px 10px 0px 0px;
border-bottom:1px dotted #999;
}
h3
{
font-size: 1.2em;
}
h4
{
font-size: 1.1em;
}
h5, h6
{
font-size: 1em;
}
/* this rule styles <h2> tags that are the
first child of the left and right table columns */
.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2
{
margin-top: 0;
}
/* PRIMARY LAYOUT ELEMENTS
----------------------------------------------------------*/
/* you can specify a greater or lesser pixel width for the
page. */
#header
{
width: 100%;
height: 75px;
border-bottom:1px #d0ceb3 solid;
background: #fff url('/Content/Images/header_background.gif') repeat top left;
}
#innerheader
{
width: 960px;
height: 74px;
margin: 0px auto 0px auto;
border:1px #d0ceb3 solid;
background: #fff url('/Content/Images/innerheader_background.gif') repeat top left;
}
#innerheader h1
{
font-weight:400;
border: none;
margin:10px 0px 0px 12px;
padding:4px 8px 8px 8px;
font-size: 22px !important;
}
#page
{
width: 960px;
margin-left: auto;
margin-right: auto;
border:1px #d0ceb3 solid;
border-top:1px #edebd5 solid;
background: #fff url('/Content/Images/nav_background.gif') repeat-y top left;
}
#main
{
background-color: #fff;
min-height: 420px;
width: 700px;
margin:10px 10px 30px 22px;
float:left;
height: auto;
}
#sideBar {
float:left;
width:198px;
}
#footer
{
clear: both;
}
/* NAV
----------------------------------------------------------*/
#menucontainer
{
border-top:1px dotted #999;
border-bottom:1px dotted #999;
display:block;
margin:43px 6px 0 6px;
}
ul#menu
{
list-style:none;
}
ul#menu li a
{
display: block;
padding: 0 1.5em;
line-height: 2.25em;
text-decoration:none;
border:1px #FFF solid;
}
ul#menu li a:hover
{
display: block;
padding: 0 1.5em;
line-height: 2.25em;
text-decoration:none;
background-color:#EEE;
border:1px #DDD solid;
}
/* Form LAYOUT ELEMENTS
----------------------------------------------------------*/
fieldset {
margin: 1em 0;
margin: 1em .5em .5em .8em;
padding: 1em;
border:1px #d0ceb3 solid;
width: 520px;
}
legend {
font-size: 1.1em;
font-weight: 600;
color: #666;
padding: 2px 4px 8px 4px;
}
label {
display: block;
}
p.formEntry{
margin: 2px 12px 2px 10px;
}
input.confirmPassword, input.password, input.textbox {
width: 200px;
border:1px #d0ceb3 solid;
}
input[type="radio"] {
}
input[type="checkbox"] {
}
input[type="submit"] {
font-weight: 600;
padding: 2px 6px 2px 6px;
margin: 10px 0px 0px 0px;
color: #666;
border-top: 1px solid #CCC;
border-right: 1px solid #a8aeb6;
border-bottom: 1px solid #a8aeb6;
border-left: 1px solid #CCC;
background: #dcdfe2;
cursor:pointer;
}
.field-validation-error
{
color: #ff0000;
margin: 0px 0px 0px 10px;
}
.input-validation-error.textbox
{
border: 1px solid #ff0000;
background-color: #ffeeee;
}
.input-validation-error.password
{
border: 1px solid #ff0000;
background-color: #ffeeee;
}
.input-validation-error.confirmPassword
{
border: 1px solid #ff0000;
background-color: #ffeeee;
}
.validation-summary-errors
{
font-weight: bold;
color: #ff0000;
}
/* MISC
----------------------------------------------------------*/
.clear
{
clear: both;
}
.error
{
color:Red;
}
#title
{
float:left;
text-align:left;
margin:8px 0px;
background: url('/Content/Images/title_background.gif') no-repeat;
height:55px;
width:329px;
}
#logindisplay
{
font-size:1.1em;
display:block;
text-align:right;
margin:10px;
}
#logindisplay a:link
{
text-decoration: underline;
}
#logindisplay a:visited
{
text-decoration: underline;
}

114
src/Orchard.Web/Content/Site3.css
View File

@@ -1,114 +0,0 @@
body {
background-color:#000;
font-size:0.85em;
min-width:900px;
color: #ebe6e6;
font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif;
}
h1, h2, h3, h4, h5, h6 {
color: #eee;
font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif;
}
#header {
background: #000 url('/Content/Images/HeaderBackground.gif') repeat-x top left;
border: 1px solid #151313;
}
#header h1 {
border:medium none;
color:#fff;
font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif;
font-size:24px !important;
font-weight:bold;
line-height:2em;
margin:0px;
padding:8px 0px 0px 10px;
}
#page
{
width: 90%;
margin-left: auto;
margin-right: auto;
}
#main {
margin:0px;
padding:10px 0px 0px 0px;
background-color:#151313;
}
#main li {
list-style:none;
}
#sideBar1, #sideBar2, #contentMain {
float:left;
}
#sideBar2 {
float:right;
}
#sideBar1, #sideBar2 {
width:20%;
padding:8px;
}
#contentMain {
width:54%;
padding:8px 4px 0px 4px;
}
#menu
{
background: #000 url('/Content/Images/HeaderBackground.gif') repeat-x bottom left;
border: 1px #312e2e solid;
}
/* TAB MENU
----------------------------------------------------------*/
ul#menu
{
border-bottom: none;
padding:2px;
position: relative;
margin: 0;
text-align: right;
}
ul#menu li
{
display: inline;
list-style: none;
}
ul#menu li a
{
padding: 6px 16px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
background: #333 url('/Content/Images/HeaderBackground.gif') repeat-x top left;
color: #fff;
}
ul#menu li a:hover
{
background-color: #333;
text-decoration: none;
}
ul#menu li a:active
{
background-color: #333;
text-decoration: none;
}
ul#menu li.selected a
{
background-color: #333;
color: #fff;
}

BIN
src/Orchard.Web/Content/images/headerBackground.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 295 B

BIN
src/Orchard.Web/Content/images/header_background.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 B

BIN
src/Orchard.Web/Content/images/innerheader_background.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 287 B

BIN
src/Orchard.Web/Content/images/nav_background.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 54 B

BIN
src/Orchard.Web/Content/images/title_background.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 374 B

1
src/Orchard.Web/Core/Themes/Views/menu.ascx
View File

@@ -2,7 +2,6 @@
<div id="menucontainer">
<ul id="menu">
<li><%= Html.ActionLink(T("Home").ToString(), "Index", "Home", new {Area = ""}, new {})%></li>
<li><%= Html.ActionLink(T("About").ToString(), "About", "Home", new { Area = "" }, new { })%></li>
<li><%= Html.ActionLink(T("Blogs").ToString(), "List", "Blog", new { Area = "Orchard.Blogs" }, new { })%></li>
<li><%= Html.ActionLink(T("Admin").ToString(), "List", new { Area = "Orchard.Blogs", Controller = "BlogAdmin" })%></li>
</ul>

10
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -92,7 +92,6 @@
<Content Include="Default.aspx" />
<Content Include="Global.asax" />
<Content Include="Web.config" />
<Content Include="Views\Home\About.ascx" />
<Content Include="Views\Home\Index.ascx" />
<Content Include="Views\Web.config" />
</ItemGroup>
@@ -148,13 +147,6 @@
</ItemGroup>
<ItemGroup>
<Content Include="Config\Diagnostics.config" />
<Content Include="Content\Images\headerBackground.gif" />
<Content Include="Content\Images\header_background.gif" />
<Content Include="Content\Images\innerheader_background.gif" />
<Content Include="Content\Images\nav_background.gif" />
<Content Include="Content\Images\title_background.gif" />
<Content Include="Content\Site2.css" />
<Content Include="Content\Site3.css" />
<Content Include="Themes\Orange\Styles\site.css" />
<Content Include="Themes\Orange\Theme.gif" />
<Content Include="Themes\Orange\Theme.txt" />
@@ -168,8 +160,6 @@
<Content Include="Themes\TheAdmin\Theme.gif" />
<Content Include="Themes\TheAdmin\Theme.txt" />
<Content Include="Themes\TheAdmin\Views\layout.ascx" />
<Content Include="Views\Templates\ThreeColumns.aspx" />
<Content Include="Views\Templates\TwoColumns.aspx" />
</ItemGroup>
<ItemGroup>
<None Include="Themes\TheAdmin\Styles\images\icons.psd" />

3
src/Orchard.Web/Views/Home/About.ascx
View File

@@ -1,3 +0,0 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<h1><%=Html.TitleForPage("About") %></h1>
<p>Put content here.</p>

2
src/Orchard.Web/Views/Home/Index.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<h1><%=Html.Encode(Html.SiteName()) %></h1>
<h2><%=Html.Encode(ViewData["Message"]) %></h2>
<p>To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.</p>
<p>To learn more about Orchard visit <a href="http://orchardproject.net" title="Orchard Project">http://orchardproject.net</a>.</p>

40
src/Orchard.Web/Views/Templates/ThreeColumns.aspx
View File

@@ -1,40 +0,0 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Pages.Models.PageRevision>" %>
<%@ Import Namespace="Orchard.Pages.Services.Templates"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%--
name: Three column layout
description: This has a main content area and two sidebars.
zones: Content, Left sidebar, Right sidebar
author: Jon
--%>
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
<title>ThreeColumns</title>
<link href="<%=ResolveUrl("~/Content/Site.css") %>" rel="stylesheet" type="text/css" />
<link href="<%=ResolveUrl("~/Content/Site3.css") %>" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="page">
<div id="header">
<%-- <% Html.Include("header"); %>
--%><%-- <% Html.Include("Navigation"); %>--%>
</div>
<ul id="main">
<li id="sideBar1">
<%= Html.IncludeZone("Left sidebar") %>
</li>
<li id="contentMain">
<%= Html.IncludeZone("Content") %>
</li>
<li id="sideBar2">
<%= Html.IncludeZone("Right sidebar") %>
</li>
<li id="footer" class="clear">
<%-- <% Html.Include("footer"); %>
--%> </li>
</ul>
</div>
</body>
</html>

56
src/Orchard.Web/Views/Templates/TwoColumns.aspx
View File

@@ -1,56 +0,0 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Pages.Models.PageRevision>" %>
<%@ Import Namespace="Orchard.Pages.Services.Templates" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%--
name: Two column layout
description: This has a main content area and a sidebar on the right.
zones: Content, Right sidebar
author: Jon
--%>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>TwoColumns</title>
<link href="<%=ResolveUrl("~/Content/Site2.css") %>" rel="stylesheet" type="text/css" />
</head>
<%--<body>
<div class="page">
<div id="header">
<% Html.Include("header"); %>
</div>
<div id="main">
<%= Html.IncludeZone("Content") %>
<%= Html.IncludeZone("Right sidebar") %>
<div id="footer">
<% Html.Include("footer"); %>
</div>
</div>
</div>
</body>--%>
<body>
<div id="header">
<div id="innerheader">
<%--<% Html.Include("header"); %>
--%></div>
</div>
<div id="page">
<div id="sideBar">
<%--<% Html.Include("Navigation"); %>
--%><%= Html.IncludeZone("Right sidebar") %>
</div>
<div id="main">
<%= Html.IncludeZone("Content") %>
</div>
<div id="footer">
<%-- <% Html.Include("footer"); %>
--%></div>
</div>
</body>
</html>