lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-08-20 07:39:17 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Left Sidebar (#7774)

Browse Source
This commit is contained in:
Sotiris Roussos 2017-07-27 22:19:02 +03:00 committed by Sébastien Ros
parent a274a584a5
commit 3ae5bbaf78
12 changed files with 328 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
View File

@ -22,8 +22,7 @@
{
<div class="panel-heading no-border">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-3 form-group form-inline">
<div class="col-xs-12 col-sm-12 col-md-6 form-group form-inline">
<div class="or-checkbox inline">
<input id="checkAll" class="check-all" type="checkbox">
<label class="check-all" for="checkAll" title="@T("Select all")"></label>
@ -43,46 +42,50 @@
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 form-group form-inline">
<div class="col-xs-12 col-sm-12 col-md-6 text-right form-group form-inline">
<a href="@Url.Action("Create", new { Area = "Contents", Id = (string)Model.Options.SelectedFilter })" class="btn btn-primary"><i class="fa fa-plus"></i> @createLinkText.Text</a>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 form-group form-inline">
<label for="filterResults" class="bulk-filter">@T("Show")</label>
<label for="filterResults" class="bulk-filter"><i class="icon s7-angle-right"></i>@T("Show")</label>
<select id="filterResults" name="Options.SelectedFilter" class="form-control">
@Html.SelectOption((string)Model.Options.SelectedFilter, "", T("any (show all)").ToString())
@foreach (var filterOption in Model.Options.FilterOptions) {
@Html.SelectOption((string)Model.Options.SelectedFilter, (string)filterOption.Key, (string)filterOption.Value)
}
</select>
@Html.SelectOption((string)Model.Options.SelectedFilter, "", T("any (show all)").ToString())
@foreach (var filterOption in Model.Options.FilterOptions)
{
@Html.SelectOption((string)Model.Options.SelectedFilter, (string)filterOption.Key, (string)filterOption.Value)
}
</select>
@if (cultures.Count() > 1)
{
<label for="filterCultures" class="bulk-culture">@T("Culture")</label>
<label for="filterCultures" class="bulk-culture"><i class="icon s7-angle-right"></i>@T("Culture")</label>
<select id="filterCultures" name="Options.SelectedCulture" class="form-control">
@Html.SelectOption((string)Model.Options.SelectedCulture, "", T("any (show all)").ToString())
@foreach (string culture in cultures) {
@Html.SelectOption((string)Model.Options.SelectedCulture, culture, System.Globalization.CultureInfo.GetCultureInfo(culture).DisplayName)
}
</select>
@Html.SelectOption((string)Model.Options.SelectedCulture, "", T("any (show all)").ToString())
@foreach (string culture in cultures)
{
@Html.SelectOption((string)Model.Options.SelectedCulture, culture, System.Globalization.CultureInfo.GetCultureInfo(culture).DisplayName)
}
</select>
}
<label for="orderResults" class="bulk-order">@T("Ordered by")</label>
<label for="orderResults" class="bulk-order"><i class="icon s7-angle-right"></i>@T("Ordered by")</label>
<select id="orderResults" name="Options.OrderBy" class="form-control">
@Html.SelectOption((ContentsOrder)Model.Options.OrderBy, ContentsOrder.Created, T("recently created").ToString())
@Html.SelectOption((ContentsOrder)Model.Options.OrderBy, ContentsOrder.Modified, T("recently modified").ToString())
@Html.SelectOption((ContentsOrder)Model.Options.OrderBy, ContentsOrder.Published, T("recently published").ToString())
</select>
@Html.SelectOption((ContentsOrder)Model.Options.OrderBy, ContentsOrder.Created, T("recently created").ToString())
@Html.SelectOption((ContentsOrder)Model.Options.OrderBy, ContentsOrder.Modified, T("recently modified").ToString())
@Html.SelectOption((ContentsOrder)Model.Options.OrderBy, ContentsOrder.Published, T("recently published").ToString())
</select>
<label for="contentResults" class="bulk-order">@T("Filter by")</label>
<label for="contentResults" class="bulk-order"><i class="icon s7-angle-right"></i>@T("Filter by")</label>
<select id="contentResults" name="Options.ContentsStatus" class="form-control">
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Owner, T("owned by me").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Latest, T("latest").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Published, T("published").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Draft, T("unpublished").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.AllVersions, T("all versions").ToString())
</select>
<button type="submit" name="submit.Filter" value="yes please" class="btn btn-default">@T("Filter")</button>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 text-right form-group form-inline">
<a href="@Url.Action("Create", new { Area = "Contents", Id = (string)Model.Options.SelectedFilter })" class="btn btn-primary"><i class="fa fa-plus"></i> @createLinkText.Text</a>
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Owner, T("owned by me").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Latest, T("latest").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Published, T("published").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.Draft, T("unpublished").ToString())
@Html.SelectOption((ContentsStatus)Model.Options.ContentsStatus, ContentsStatus.AllVersions, T("all versions").ToString())
</select>
<button type="submit" name="submit.Filter" value="yes please" class="btn btn-default">@T("Filter")</button>
</div>
</div>
</div>

4
src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
View File

@ -71,11 +71,11 @@
</fieldset>
<fieldset class="form-group">
<div class="or-checkbox">
@Html.CheckBoxFor(m => m.UseFileHash)
@Html.CheckBoxFor(m => m.UseFileHash)
@Html.LabelFor(m => m.UseFileHash, T("Use Resource File Hashing").Text, new { @class = "forcheckbox" })
</div>
<span class="hint">@T("Determines whether MD5 file hashes are appended to the URLs for scripts and stylesheets (provides automatic cache busting).")</span>
</div>
</fieldset>
<fieldset class="form-group">
<label for="DefaultPageSize">@T("Default number of items per page")</label>
@Html.TextBoxFor(m => m.PageSize, new { @class = "form-control auto-size" })

2
src/Orchard.Web/Modules/Orchard.Autoroute/Views/DefinitionTemplates/AutorouteSettings.cshtml
View File

@ -75,7 +75,7 @@
<tr>
<td>
<div class="or-radio">
<input type="radio" id="@radioId" name="@Html.NameFor(m => m.DefaultPatterns[cultures.IndexOf(culture)].Culture)" value="@(culture + "|" + patternCultureCount)" @if (patternCultureCount.ToString() == Model.DefaultPatterns[Model.SiteCultures.IndexOf(culture)].PatternIndex) { <text>checked="checked"</text>} />
<input type="radio" id="@radioId" name="@Html.NameFor(m => m.DefaultPatterns[cultures.IndexOf(culture)].Culture)" value="@(culture + "|" + patternCultureCount)" @if (patternCultureCount.ToString() == Model.DefaultPatterns[cultures.IndexOf(culture)].PatternIndex) { <text>checked="checked"</text>} />
<label for="@radioId"></label>
</div>
</td>

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
View File

@ -11,7 +11,7 @@
<div class="panel-heading information">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#@accordionId" href="#@accordionPanelId" aria-expanded="false" class="collapsed">
<i class="icon fa fa-angle-down"></i> @String.Format("{0} ({1})", Model.DisplayName, Model.FieldDefinition._Definition.Name)
<i class="icon s7-angle-down"></i> @String.Format("{0} ({1})", Model.DisplayName, Model.FieldDefinition._Definition.Name)
</a>
<span class="manage">
<a href="@Url.Action("RemoveFieldFrom", new {area = "Orchard.ContentTypes", id = Model.Part.Name, name = Model.Name})" class="btn-link btn-danger" itemprop="RemoveUrl UnsafeUrl">

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
View File

@ -16,7 +16,7 @@
<div class="panel-heading information">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#@accordionId" href="#@accordionPanelId" aria-expanded="false" class="collapsed">
<i class="icon fa fa-angle-down @hasSettings"></i> @Model.PartDefinition.DisplayName
<i class="icon s7-angle-down @hasSettings"></i> @Model.PartDefinition.DisplayName
</a>
@if (Model.PartDefinition.Settings.GetModel<ContentPartSettings>().Attachable)
{

9
src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Toolbox.less
View File

@ -26,6 +26,11 @@
bottom: 0;
}
ul {
list-style: none;
padding: 0;
}
.layout-toolbox-group {
margin-top: @container-padding;
@ -33,7 +38,7 @@
display: block;
margin-bottom: @container-padding / 3;
text-decoration: none;
&:before {
display: inline-block;
width: 10px;
@ -43,7 +48,7 @@
content: "\f0d7";
}
}
&.collapsed {
.layout-toolbox-group-heading:before {
content: "\f0da";

21
src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
View File

File diff suppressed because one or more lines are too long

2
src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
src/Orchard.Web/Modules/Orchard.Localization/Views/DefinitionTemplates/LocalizationCultureNeutralitySettings.cshtml
View File

@ -1,7 +1,8 @@
@model Orchard.Localization.Settings.LocalizationCultureNeutralitySettings
<fieldset>
@Html.CheckBoxFor(m => m.CultureNeutral)
<label for="@Html.FieldIdFor(m => m.CultureNeutral)" class="forcheckbox">@T("Culture Neutral")</label>
<fieldset class="form-group">
<div class="or-checkbox">
@Html.CheckBoxFor(m => m.CultureNeutral)
@Html.LabelFor(m => m.CultureNeutral, T("Culture Neutral").Text, new { @class = "forcheckbox" })
</div>
<span class="hint">@T("Check to mark this part/field as Culture Neutral. The values of Culture Neutral components will be synchronized across elements of a localization set whenever one of them is published.")</span>
</fieldset>

11
src/Orchard.Web/Themes/TheAdmin/Assets/Less/orchard-left-sidebar.less
View File

@ -1,13 +1,14 @@
/*------------------------------------------------------------------
[Left sidebar]
*/
.sidebar-elements {
.or-left-sidebar .sidebar-elements {
> li {
> a {
text-align: left;
position: relative;
padding: 7px 7px 7px 15px;
//RTL Support
.rtl & {
text-align: right;
@ -15,9 +16,11 @@
.icon {
display: inline-block;
font-size: 25px;
font-size: 22px;
margin-right: 10px;
vertical-align: middle;
width: 20px;
text-align: center;
//RTL Support
.rtl & {
margin-right: 0;
@ -68,6 +71,10 @@
padding-top: 0;
overflow: visible;
position: relative;
> ul > li > a {
padding: 7px 30px;
}
}
}
}

491
src/Orchard.Web/Themes/TheAdmin/Styles/TheAdmin.css
View File

File diff suppressed because one or more lines are too long

2
src/Orchard.Web/Themes/TheAdmin/Styles/TheAdmin.min.css vendored
View File

File diff suppressed because one or more lines are too long