mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
Nathan Heskew
@@ -7,8 +7,8 @@ using Orchard.Core.Common.Models;
|
||||
using Orchard.Core.Contents.Extensions;
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.Common.DataMigrations {
|
||||
public class CommonDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.Common {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
public int Create() {
|
||||
//CREATE TABLE Common_BodyPartRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id));
|
||||
SchemaBuilder.CreateTable("BodyPartRecord", table => table
|
||||
@@ -6,8 +6,8 @@ using Orchard.Core.Contents.Extensions;
|
||||
using Orchard.Core.Localization.Models;
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.Localization.DataMigrations {
|
||||
public class LocalizationDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.Localization {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
|
||||
public int Create() {
|
||||
//CREATE TABLE Localization_LocalizedRecord (Id INTEGER not null, CultureId INTEGER, MasterContentItemId INTEGER, primary key (Id));
|
||||
@@ -1,7 +1,7 @@
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.Messaging.DataMigrations {
|
||||
public class MessagingDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.Messaging {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
|
||||
public int Create() {
|
||||
SchemaBuilder.CreateTable("MessageSettingsPartRecord", table => table
|
||||
@@ -6,8 +6,8 @@ using Orchard.Core.Contents.Extensions;
|
||||
using Orchard.Core.Navigation.Models;
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.Navigation.DataMigrations {
|
||||
public class NavigationDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.Navigation {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
|
||||
public int Create() {
|
||||
//CREATE TABLE Navigation_MenuItemRecord (Id INTEGER not null, Url TEXT, primary key (Id));
|
||||
@@ -66,7 +66,7 @@
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Common\DataMigrations\CommonDataMigration.cs" />
|
||||
<Compile Include="Common\Migrations.cs" />
|
||||
<Compile Include="Common\Drivers\BodyPartDriver.cs" />
|
||||
<Compile Include="Common\Drivers\CommonPartDriver.cs" />
|
||||
<Compile Include="Common\Drivers\TextFieldDriver.cs" />
|
||||
@@ -100,7 +100,7 @@
|
||||
<Compile Include="Dashboard\Controllers\HelperController.cs" />
|
||||
<Compile Include="Localization\ResourceManifest.cs" />
|
||||
<Compile Include="Localization\ViewModels\EditLocalizationViewModel.cs" />
|
||||
<Compile Include="Messaging\DataMigrations\MessagingDataMigration.cs" />
|
||||
<Compile Include="Messaging\Migrations.cs" />
|
||||
<Compile Include="Messaging\Drivers\MessageSettingsPartDriver.cs" />
|
||||
<Compile Include="Messaging\Handlers\MessageSettingsPartHandler.cs" />
|
||||
<Compile Include="Messaging\Models\MessageSettingsPart.cs" />
|
||||
@@ -109,7 +109,7 @@
|
||||
<Compile Include="Messaging\ViewModels\MessageSettingsPartViewModel.cs" />
|
||||
<Compile Include="Navigation\Services\MainMenuNavigationProvider.cs" />
|
||||
<Compile Include="PublishLater\ResourceManifest.cs" />
|
||||
<Compile Include="PublishLater\DataMigrations\PublishLaterDataMigration.cs" />
|
||||
<Compile Include="PublishLater\Migrations.cs" />
|
||||
<Compile Include="PublishLater\Drivers\PublishLaterPartDriver.cs" />
|
||||
<Compile Include="PublishLater\Models\PublishLaterPart.cs" />
|
||||
<Compile Include="PublishLater\Handlers\PublishLaterPartHandler.cs" />
|
||||
@@ -127,10 +127,10 @@
|
||||
<Compile Include="Reports\Controllers\AdminController.cs" />
|
||||
<Compile Include="Reports\Routes.cs" />
|
||||
<Compile Include="Localization\Controllers\AdminController.cs" />
|
||||
<Compile Include="Localization\DataMigrations\LocalizationDataMigration.cs" />
|
||||
<Compile Include="Localization\Migrations.cs" />
|
||||
<Compile Include="Localization\ViewModels\AddLocalizationViewModel.cs" />
|
||||
<Compile Include="Localization\Drivers\LocalizationPartDriver.cs" />
|
||||
<Compile Include="Navigation\DataMigrations\NavigationDataMigration.cs" />
|
||||
<Compile Include="Navigation\Migrations.cs" />
|
||||
<Compile Include="Reports\ViewModels\DisplayReportViewModel.cs" />
|
||||
<Compile Include="Reports\ViewModels\ReportsAdminIndexViewModel.cs" />
|
||||
<Compile Include="Routable\Controllers\ItemController.cs" />
|
||||
@@ -204,7 +204,7 @@
|
||||
<Compile Include="Routable\Services\RoutableService.cs" />
|
||||
<Compile Include="Routable\ViewModels\RoutableEditorViewModel.cs" />
|
||||
<Compile Include="Routable\ViewModels\RoutableDisplayViewModel.cs" />
|
||||
<Compile Include="Scheduling\DataMigrations\SchedulingDataMigration.cs" />
|
||||
<Compile Include="Scheduling\Migrations.cs" />
|
||||
<Compile Include="Scheduling\Models\ScheduledTaskRecord.cs" />
|
||||
<Compile Include="PublishLater\Handlers\PublishingTaskHandler.cs" />
|
||||
<Compile Include="PublishLater\Services\PublishingTaskManager.cs" />
|
||||
@@ -212,7 +212,7 @@
|
||||
<Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
|
||||
<Compile Include="Scheduling\Models\Task.cs" />
|
||||
<Compile Include="Settings\ResourceManifest.cs" />
|
||||
<Compile Include="Settings\DataMigrations\SettingsDataMigration.cs" />
|
||||
<Compile Include="Settings\Migrations.cs" />
|
||||
<Compile Include="Settings\Drivers\SiteSettingsPartDriver.cs" />
|
||||
<Compile Include="Settings\ViewModels\SiteCulturesViewModel.cs" />
|
||||
<Compile Include="Settings\Metadata\ContentDefinitionManager.cs" />
|
||||
|
||||
@@ -6,8 +6,8 @@ using Orchard.Core.Contents.Extensions;
|
||||
using Orchard.Core.PublishLater.Models;
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.PublishLater.DataMigrations {
|
||||
public class PublishLaterDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.PublishLater {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
public int Create() {
|
||||
ContentDefinitionManager.AlterPartDefinition(typeof(PublishLaterPart).Name, cfg => cfg
|
||||
.WithLocation(new Dictionary<string, ContentLocation> {
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.Scheduling.DataMigrations {
|
||||
public class SchedulingDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.Scheduling {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
|
||||
public int Create() {
|
||||
//CREATE TABLE Scheduling_ScheduledTaskRecord (Id integer, TaskType TEXT, ScheduledUtc DATETIME, ContentItemVersionRecord_id INTEGER, primary key (Id));
|
||||
@@ -1,8 +1,8 @@
|
||||
using System.Data;
|
||||
using Orchard.Data.Migration;
|
||||
|
||||
namespace Orchard.Core.Settings.DataMigrations {
|
||||
public class SettingsDataMigration : DataMigrationImpl {
|
||||
namespace Orchard.Core.Settings {
|
||||
public class Migrations : DataMigrationImpl {
|
||||
|
||||
public int Create() {
|
||||
//CREATE TABLE Settings_ContentFieldDefinitionRecord (Id integer, Name TEXT, primary key (Id));
|
||||
@@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using Orchard.Blogs.Models;
|
||||
using Orchard.ContentManagement.Drivers;
|
||||
using Orchard.ContentManagement.MetaData;
|
||||
@@ -95,5 +96,13 @@ namespace Orchard.Blogs {
|
||||
cfg => cfg.WithPart("BlogPagerPart"));
|
||||
return 6;
|
||||
}
|
||||
|
||||
public int UpdateFrom6() {
|
||||
SchemaBuilder.AlterTable("BlogPartRecord", table => table
|
||||
.AlterColumn("Description", c => c.WithType(DbType.String).Unlimited())
|
||||
);
|
||||
|
||||
return 7;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
using Orchard.ContentManagement.Records;
|
||||
using Orchard.Data.Conventions;
|
||||
|
||||
namespace Orchard.Blogs.Models {
|
||||
public class BlogPartRecord : ContentPartRecord {
|
||||
[StringLengthMax]
|
||||
public virtual string Description { get; set; }
|
||||
public virtual int PostCount { get; set; }
|
||||
}
|
||||
|
||||
@@ -217,6 +217,10 @@
|
||||
<Content Include="TheAdmin\Theme.png" />
|
||||
<Content Include="TheAdmin\Views\User.cshtml" />
|
||||
<Content Include="TheAdmin\Views\Header.cshtml" />
|
||||
<Content Include="TheThemeMachine\Views\Items\BlogPost.Summary.cshtml" />
|
||||
<Content Include="TheThemeMachine\Views\Items\BlogPost.cshtml">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
<None Include="TheThemeMachine\Views\Layout.cshtml" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
@@ -7,6 +7,7 @@ Copyright: 2010, Orchard. All Rights Reserved
|
||||
|
||||
/* Color Palette
|
||||
**************************************************************
|
||||
|
||||
Background: #fff
|
||||
Borders: #dbdbdb
|
||||
Text: #434343
|
||||
@@ -61,28 +62,30 @@ header, footer, aside, nav, article { display: block; }
|
||||
|
||||
/* Clearing Floats
|
||||
***************************************************************/
|
||||
|
||||
.group:after
|
||||
{
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.zone-asidethird:after
|
||||
{
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* General
|
||||
***************************************************************/
|
||||
|
||||
/* Default font settings.
|
||||
The font-size 62.5% sets the base font to 10px */
|
||||
body {
|
||||
@@ -154,9 +157,10 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
|
||||
|
||||
/* Structure
|
||||
***************************************************************/
|
||||
|
||||
#layout-wrapper
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
#layout-header, #layout-before-main, #layout-main, #layout-footer, #layout-after-main, #layout-tripel {
|
||||
@@ -166,28 +170,33 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
|
||||
|
||||
#layout-header
|
||||
{
|
||||
margin: 30px auto;
|
||||
margin: 30px auto;
|
||||
}
|
||||
#branding
|
||||
{
|
||||
font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif;
|
||||
font-size: 3.4em;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
}
|
||||
#branding
|
||||
{
|
||||
font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif;
|
||||
font-size: 3.4em;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
}
|
||||
|
||||
#branding a
|
||||
{
|
||||
text-decoration:none;
|
||||
color: #434343;
|
||||
}
|
||||
#branding a
|
||||
{
|
||||
text-decoration:none;
|
||||
color: #434343;
|
||||
}
|
||||
|
||||
#layout-tripel
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
}
|
||||
|
||||
#layout-before-main
|
||||
{
|
||||
border-bottom: 1px solid #dbdbdb;
|
||||
}
|
||||
|
||||
#layout-main
|
||||
{
|
||||
border-top: 1px solid #fff;
|
||||
@@ -195,17 +204,17 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
|
||||
|
||||
#layout-after-main
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* Navigation */
|
||||
#layout-navigation
|
||||
{
|
||||
width: 960px;
|
||||
width: 960px;
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
border-bottom: 1px solid #dbdbdb;
|
||||
border-bottom: 1px solid #dbdbdb;
|
||||
}
|
||||
|
||||
nav ul
|
||||
@@ -213,41 +222,45 @@ nav ul
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
nav ul li
|
||||
{
|
||||
border:1px solid #dbdbdb;
|
||||
background:#f6f6f6;
|
||||
display:block;
|
||||
float:left;
|
||||
margin:0 2px -1px 0;
|
||||
}
|
||||
nav ul li.current
|
||||
{
|
||||
border-bottom: 1px solid #fff;
|
||||
background:#fff;
|
||||
}
|
||||
nav ul a
|
||||
{
|
||||
padding:0 18px;
|
||||
display:block;
|
||||
float:left;
|
||||
color: #333;
|
||||
font-size:1.4em;
|
||||
text-decoration:none;
|
||||
line-height:24px;
|
||||
}
|
||||
nav ul li
|
||||
{
|
||||
border:1px solid #dbdbdb;
|
||||
background:#f6f6f6;
|
||||
display:block;
|
||||
float:left;
|
||||
margin:0 2px -1px 0;
|
||||
}
|
||||
nav ul li.current
|
||||
{
|
||||
border-bottom: 1px solid #fff;
|
||||
background:#fff;
|
||||
}
|
||||
nav ul a
|
||||
{
|
||||
padding:0 18px;
|
||||
display:block;
|
||||
float:left;
|
||||
color: #333;
|
||||
font-size:1.4em;
|
||||
text-decoration:none;
|
||||
line-height:24px;
|
||||
}
|
||||
|
||||
#layout-footer
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
border-top: 1px solid #dbdbdb;
|
||||
}
|
||||
#footer-sig
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/* Zones */
|
||||
/*.zone {
|
||||
background-color: yellow;
|
||||
box-shadow:inset 0 0 1px red;
|
||||
-moz-box-shadow:inset 0 0 1px red;
|
||||
-webkit-box-shadow:inset 0 0 1px red;
|
||||
background-color: yellow;
|
||||
box-shadow:inset 0 0 1px red;
|
||||
-moz-box-shadow:inset 0 0 1px red;
|
||||
-webkit-box-shadow:inset 0 0 1px red;
|
||||
} Used for visualizing zones */
|
||||
.zone-header { }
|
||||
.zone-footer { padding: 24px 0 12px 0px; float: left; font-size: 1.3em; color: #999999; }
|
||||
@@ -255,6 +268,7 @@ nav ul
|
||||
.zone-asidethird { padding: 0 0 6px 0; }
|
||||
|
||||
|
||||
|
||||
/* Main
|
||||
***************************************************************/
|
||||
|
||||
@@ -267,7 +281,7 @@ nav ul
|
||||
|
||||
.has-aside-two .aside-second
|
||||
{
|
||||
width: 360px;
|
||||
width: 360px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
@@ -287,69 +301,64 @@ nav ul
|
||||
}
|
||||
.has-asides .aside-first, .has-asides .aside-second
|
||||
{
|
||||
width: 180px;
|
||||
width: 180px;
|
||||
}
|
||||
.has-asides .aside-first, .has-asides .aside-second, .has-asides #layout-content
|
||||
{
|
||||
float:left;
|
||||
float:left;
|
||||
}
|
||||
|
||||
/* Blogs */
|
||||
|
||||
.blog-post {}
|
||||
.blog-post-title {}
|
||||
.meta {}
|
||||
|
||||
|
||||
/* Secondary
|
||||
***************************************************************/
|
||||
|
||||
/* Comments */
|
||||
.comment {}
|
||||
.comment .who {}
|
||||
.comment .what {}
|
||||
.comment #add-comment {}
|
||||
|
||||
.comment #comment-by { font-size: 1.6em; font-weight: normal; margin: 0 0 1.2em 0; border:none; }
|
||||
.comment #comment-text { width: 33.2em; }
|
||||
.comment input[type="text"] { width: 32em; }
|
||||
|
||||
|
||||
|
||||
/* Forms
|
||||
***************************************************************/
|
||||
label { font-weight: normal; display:block; }
|
||||
label.forcheckbox { margin:0 0 0 .4em; display:inline; }
|
||||
form { margin: 0; padding: 0; }
|
||||
legend { font-size: 1.6em; font-weight: normal; margin: 0 0 1.2em 0; border:none; }
|
||||
fieldset { padding:0em; margin: 0 0 0em 0; border: 0px solid #dbdbdb; }
|
||||
legend { font-weight: 600; font-size:1.2em; }
|
||||
label { font-size: 1.3em; font-weight: normal; display:block; padding: 0 0 0.3em 0; }
|
||||
label.forcheckbox { margin:0 0 0 .4em; display:inline; }
|
||||
|
||||
input[type="text"], #CommentText, #password, #confirmPassword {
|
||||
border:1px solid #999;
|
||||
display: block;
|
||||
padding:6px;
|
||||
width:50%;
|
||||
input[type="text"], input[type="password"] {
|
||||
display: block;
|
||||
padding: 0.3em;
|
||||
}
|
||||
|
||||
form.search {
|
||||
margin-bottom:2em;
|
||||
}
|
||||
|
||||
.search input[type=text] {
|
||||
display:inline;
|
||||
width:17em;
|
||||
}
|
||||
|
||||
fieldset ol {list-style-type:none;}
|
||||
|
||||
fieldset ol li {margin:1.6em 0 0 0}
|
||||
|
||||
legend {
|
||||
font-size: 1.4em;
|
||||
border:none;
|
||||
}
|
||||
|
||||
label {
|
||||
font-size: 1.3em;
|
||||
margin:0 0 .3em 0;
|
||||
}
|
||||
|
||||
input[type="checkbox"] {
|
||||
margin:.2em 0 1.2em 0;
|
||||
margin:.2em 0 1.2em 0;
|
||||
}
|
||||
|
||||
fieldset ol { list-style-type:none; padding: 0; margin: 0; }
|
||||
fieldset ol li { margin: 0 0 6px 0; }
|
||||
|
||||
/*
|
||||
input[type="submit"], input[type="button"], button, .button, .button:link, .button:visited {
|
||||
color:#333;
|
||||
background:#F5F5F5;
|
||||
background:#F5F5F5;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb));
|
||||
background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb);
|
||||
border:1px solid #999;
|
||||
cursor:pointer;
|
||||
margin:.2em 0 2em 0;
|
||||
margin:.2em 0 2em 0;
|
||||
padding:.3em 1.8em;
|
||||
text-align:center;
|
||||
}
|
||||
@@ -360,11 +369,12 @@ input[type="submit"]:focus, input[type="button"]:focus,
|
||||
button:hover, .button:hover,
|
||||
button:active, .button:active,
|
||||
button:focus, .button:focus {
|
||||
text-decoration:none;
|
||||
background: #ebebeb;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb));
|
||||
text-decoration:none;
|
||||
background: #ebebeb;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb));
|
||||
background:-moz-linear-gradient(top , #e1e1e1, #ebebeb);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -402,77 +412,62 @@ button:focus, .button:focus {
|
||||
/* CSS 3 Enhancements
|
||||
***************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
/* For testing purposes */
|
||||
#comments, #commenter {
|
||||
font-size:1.6em;
|
||||
font-weight:600;
|
||||
margin:1.2em 0 1.8em 1.2em;
|
||||
}
|
||||
|
||||
#commenter {
|
||||
margin:1.2em 0 0 1em;
|
||||
}
|
||||
|
||||
ul.comments, form.comment {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
article.comment h4 {
|
||||
font-size:1.4em;
|
||||
}
|
||||
|
||||
article.comment a {
|
||||
color:#484848;
|
||||
text-decoration:none;
|
||||
color:#484848;
|
||||
text-decoration:none;
|
||||
}
|
||||
|
||||
article.comment span.who {
|
||||
font-weight:600;
|
||||
font-style:normal;
|
||||
text-transform:capitalize;
|
||||
color:#333;
|
||||
font-weight:600;
|
||||
font-style:normal;
|
||||
text-transform:capitalize;
|
||||
color:#333;
|
||||
}
|
||||
|
||||
article.comment p.text {
|
||||
margin:.6em 0 2.4em 0;
|
||||
margin:.6em 0 2.4em 0;
|
||||
}
|
||||
|
||||
.user-display {
|
||||
display:inline;
|
||||
display:inline;
|
||||
}
|
||||
|
||||
/*.aside.third {
|
||||
border-top:1px solid #dbdbdb;
|
||||
clear:both;
|
||||
border-top:1px solid #dbdbdb;
|
||||
clear:both;
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
#footer-quad div.zone {
|
||||
float:left;
|
||||
width:240px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
float:left;
|
||||
width:240px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
}
|
||||
|
||||
/* Featured Zone - switch to an image */
|
||||
|
||||
.featuredimage {
|
||||
float:left;
|
||||
border: 1px solid #dbdbdb;
|
||||
width: 462px;
|
||||
height: 240px;
|
||||
margin: 6px;
|
||||
float:left;
|
||||
border: 1px solid #dbdbdb;
|
||||
width: 462px;
|
||||
height: 240px;
|
||||
margin: 6px;
|
||||
}
|
||||
|
||||
/* Recent Zone */
|
||||
|
||||
#zone-recent ul li {
|
||||
float:left;
|
||||
width: 462px;
|
||||
margin: 6px;
|
||||
float:left;
|
||||
width: 462px;
|
||||
margin: 6px;
|
||||
}
|
||||
|
||||
.clearfix {
|
||||
@@ -480,40 +475,32 @@ article.comment p.text {
|
||||
}
|
||||
|
||||
#footer div {
|
||||
/*border:1px solid #ff0000;*/
|
||||
/*border:1px solid #ff0000;*/
|
||||
}
|
||||
|
||||
/* Tripel */
|
||||
|
||||
#layout-tripel div {
|
||||
float:left;
|
||||
width:960px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
}
|
||||
|
||||
/*1 zone on */
|
||||
.tripel-1 #tripel-first { width:960px; }
|
||||
|
||||
/*2 zone on */
|
||||
.tripel-2 #tripel-second { width:960px; }
|
||||
|
||||
/*3 zone on */
|
||||
.tripel-3 #tripel-third { width:960px; }
|
||||
|
||||
/*2 zones on */
|
||||
|
||||
/* If zones 1, 2 are on */
|
||||
.tripel-12 #tripel-first, .tripel-12 #tripel-second { width:480px; }
|
||||
.tripel-12 #layout-tripel div { width:480px; }
|
||||
|
||||
/* If zones 2, 3 are on */
|
||||
.tripel-23 #tripel-second, .tripel-23 #tripel-third { width:480px; }
|
||||
.tripel-23 #layout-tripel div { width:480px; }
|
||||
|
||||
/* If zones 1, 3 are on */
|
||||
.tripel-13 #tripel-first, .tripel-13 #tripel-third { width:480px; }
|
||||
.tripel-13 #layout-tripel div { width:480px; }
|
||||
|
||||
/*3 zones on */
|
||||
|
||||
/* If zones 1, 2, 3 are on */
|
||||
.tripel-123 #tripel-first, .tripel-123 #tripel-second, .tripel-123 #tripel-third { width:320px; }
|
||||
.tripel-123 #layout-tripel div { width:320px; }
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
@using Orchard.Blogs.Extensions;
|
||||
@using Orchard.Blogs.Models;
|
||||
@using Orchard.Core.Common.Extensions;
|
||||
@using Orchard.Core.Common.Models;
|
||||
@using Orchard.Core.Common.ViewModels;
|
||||
|
||||
<h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
|
||||
|
||||
<!-- TODO: Meta should be it's own shape and not part of the blog summary view. Theme authors will need access to it. -->
|
||||
<div class="meta">
|
||||
@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T)
|
||||
@Display(Model.meta)
|
||||
</div>
|
||||
|
||||
<div class="content">@Display(Model.Content)</div>
|
||||
@@ -0,0 +1,11 @@
|
||||
<div class="blog-post @Display(Model.Slug)">
|
||||
<h1 class="blog-post-title">@Html.TitleForPage((string)Model.Title)</h1>
|
||||
@if (Model.Meta != null) {
|
||||
<div class="meta">
|
||||
@Display(Model.Meta)
|
||||
</div>
|
||||
}
|
||||
<div class="content">
|
||||
@Display(Model.Content)
|
||||
</div>
|
||||
</div>
|
||||
@@ -47,10 +47,6 @@
|
||||
Model.Classes.Add(footerQuadClass);
|
||||
}
|
||||
|
||||
<span>debug: </span>
|
||||
<span>tripelClass:@tripelClass</span><br />
|
||||
<span>footerQuadClass:@footerQuadClass</span>
|
||||
|
||||
Model.Id = "layout-wrapper";
|
||||
var tag = Tag (Model, "div");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user