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

Updated User shape and more CSS revisions

Browse Source 
--HG--
branch : dev
This commit is contained in:
Michael Dorian Bach
2010-10-13 19:22:49 -07:00
parent b0b88daab4
commit e10dc241c4
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@
<Content Include="Themes\TheAdmin\Styles\images\menuOpen.gif" />
<Content Include="Themes\TheAdmin\Styles\images\menuOpenHover.gif" />
<Content Include="Themes\TheThemeMachine\draft.html" />
<Content Include="Themes\TheThemeMachine\Styles\site.css" />
<Content Include="Themes\TheThemeMachine\Styles\Site.css" />
<Content Include="Themes\TheThemeMachine\Theme.png" />
<Content Include="Themes\TheThemeMachine\Theme.txt" />
<None Include="Themes\Classic\App_Data\Localization\fr-FR\orchard.theme.po" />
@@ -145,6 +145,7 @@
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Themes\TheThemeMachine\Views\User.cshtml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Orchard\Orchard.Framework.csproj">

15
src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
View File

@@ -80,6 +80,7 @@ header, footer, aside, nav, article { display: block; }
}
/* General
***************************************************************/
/* Default font settings.
@@ -165,7 +166,6 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
#layout-header
{
border-top: 1px solid #dbdbdb;
margin: 36px auto;
}
#branding
@@ -178,6 +178,11 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
text-decoration:none;
}
#layout-footer
{
border-top: 1px solid #dbdbdb;
}
/* Navigation */
#navigation
{
@@ -217,11 +222,11 @@ nav ul
}
/* Zones */
/*.zone { background-color: yellow; } Used for visualizing zones */
.zone-header {}
/* .zone { background-color: yellow; } Used for visualizing zones */
.zone-header { }
.zone-footer { padding: 24px 0 12px 0px; float: left; font-size: 1.3em; color: #999999; }
.zone-content { padding: 12px 0 12px 0px; }
.zone-asidethird {}
.zone-asidethird { padding: 0 0 6px 0; }
/* Main
@@ -362,6 +367,8 @@ button:focus, .button:focus {
.bottom { margin-bottom:0; padding-bottom:0; }
.user-display { float: left; padding: 24px 12px 12px 12px; font-size: 1.3em; }
.user-display .welcome {}
.user-display .user-actions {}

5
src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
View File

@@ -82,14 +82,17 @@
</aside>
}
</div>
@* span -> p (?) *@
@using(Capture(pbo => WorkContext.Layout.Footer.Add(pbo) )) {
<span>Powered by Orchard &#169; The Theme Machine 2010.</span>
<span class="poweredby">Powered by Orchard</span> <span class="copyright">&#169; The Theme Machine 2010.</span>
}
@if(Model.Footer != null) {
<footer id="layout-footer" class="group">
@Zone(Model.Footer)
@Display.User()
</footer>
}
@tag.EndElement

13
src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml Normal file
View File

@@ -0,0 +1,13 @@
@using System.Web.Mvc;
<div class="user-display">
@if (Request.IsAuthenticated) {
<span class="welcome">@T("Welcome, <strong>{0}</strong>!", WorkContext.CurrentUser.UserName)</span>
<span class="user-actions">
@Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })
@Html.ActionLink("Dashboard", "Index", new { Area = "Dashboard", Controller = "Admin" })
</span>
} else {
<span class="user-actions">@Html.ActionLink(T("Login").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })</span>
}
</div>