From d96f3a405128962e06b480f10d0efaeb251c594c Mon Sep 17 00:00:00 2001 From: jowall Date: Thu, 24 Mar 2011 15:33:12 -0700 Subject: [PATCH 01/21] Fixed button gradients for Chrome. --HG-- branch : dev --- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 8a9c70091..6bd0fec46 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -696,9 +696,8 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { /*----In ie the first couplet sets the alpha value so 00=transparent and ff=opaque)----*/ filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fff5f5f5', endColorstr='#ffd9d9d9'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(245, 245, 245, 1.0)), to (rgba(217, 217, 217, 1.0))); + background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(245, 245, 245, 1.0)), to(rgba(217, 217, 217, 1.0))); background: -moz-linear-gradient(top, rgba(245, 245, 245, 1.0), rgba(217, 217, 217, 1.0)); - -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -732,7 +731,7 @@ button, .button, a.button { /*----In ie the first couplet sets the alpha value so 00=transparent and ff=opaque)----*/ filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff9bb36c', endColorstr='#ff809f43'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), rgba((106, 123, 66, 1.0))); + background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(155, 179, 108, 1.0)), to(rgba(128, 159, 67, 1.0))); background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(128, 159, 67, 1.0)); @@ -753,8 +752,8 @@ button:hover, .button:hover, a.button:hover { background: #809f43; /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff6e7f45', endColorstr='#ff6a7b42'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), rgba((106, 123, 66, 1.0))); + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff6e7f45', endColorstr='#ff6a7b42'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), to(rgba(106, 123, 66, 1.0))); background: -moz-linear-gradient(top, rgba(110, 127, 69, 1.0), rgba(106, 123, 66, 1.0)); } @@ -767,7 +766,7 @@ button:active, .buton:active, a.button:active { /*CSS3 properties*/ text-shadow: rgba(0,0,0,.5) 0px 0px 1px; filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff9bb36c', endColorstr='#ff809f43'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), rgba((106, 123, 66, 1.0))); + background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(155, 179, 108, 1.0)), to(rgba(128, 159, 67, 1.0))); background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(128, 159, 67, 1.0)); } button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner { From d21621b6ae2d59b1269fb78108faaabb82dda51d Mon Sep 17 00:00:00 2001 From: Dave Reed Date: Thu, 24 Mar 2011 15:39:13 -0700 Subject: [PATCH 02/21] Wordsmithing the AddParts screen. --HG-- branch : dev --- .../Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml index aef112600..4008075aa 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml @@ -3,7 +3,7 @@ Style.Require("ContentTypesAdmin"); Layout.Title = T("Add Parts To \"{0}\"", Model.Type.DisplayName).ToString(); } - +@T("Choose the Parts to add to this Content Type. The Common part should be included in most types. It gives the items an owner as well as a creation, publication and last modification date stamps. In addition to the Common part, adding the Containable part makes it possible to add content items of this type to a List.") @using (Html.BeginFormAntiForgeryPost()) { @Html.ValidationSummary()
From 36a67d3324b930d205264d2e8998dbf1ca7a503d Mon Sep 17 00:00:00 2001 From: jowall Date: Thu, 24 Mar 2011 15:45:19 -0700 Subject: [PATCH 03/21] Fixed breadcrumb margin on media screen. --HG-- branch : dev --- .../Modules/Orchard.Media/Styles/orchard-media-admin.css | 4 ++-- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css index 5afaf4635..71f5c1eae 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css @@ -1,10 +1,10 @@ .breadCrumbs { float:left; - margin:-2em 0 0; + margin:0 0 16px 0; } .folderProperties { float:right; - margin:-5em 0 0; + margin:0 0 16px 0; } .previewImage { max-height:640px; diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 6bd0fec46..e11fd1af0 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -873,7 +873,6 @@ table.items tbody { } table.items thead, table.items th { background:#f5f5f5; - font-weight:700; overflow:hidden; text-align:left; white-space:nowrap; From 3c5a27ef651224c23b731f6f4e5556a9b3e30679 Mon Sep 17 00:00:00 2001 From: jowall Date: Thu, 24 Mar 2011 15:49:33 -0700 Subject: [PATCH 04/21] Fixed font size for textareas. --HG-- branch : dev --- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index e11fd1af0..ced0fd55f 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -608,6 +608,7 @@ select, textarea, input.text, input.textMedium, input.text-box { padding:3px; border:1px solid #bdbcbc; font-family:inherit; + font-size:inherit; } input.text, input.textMedium, input.text-box { line-height:1.2em; From 3f6ceb7e451621acb8c8958290b79df644d93e61 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 24 Mar 2011 15:53:33 -0700 Subject: [PATCH 05/21] Refactoring ST tabs --HG-- branch : dev --- .../orchard-designertools-shapetracing.js | 9 ++- .../Services/ShapeTracingFactory.cs | 4 +- .../Views/ShapeTracingMeta.cshtml | 56 +++++++++---------- .../Views/ShapeTracingWrapper.cshtml | 4 +- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js index c9be9dfe0..9f5f1bb6d 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js @@ -292,10 +292,10 @@ // add the expand/collapse logic to the shape model // var glyph = $('​'); - shapeTracingWindowContent.find('.model li:has(ul)').prepend(glyph); + shapeTracingWindowContent.find('li:has(ul)').prepend(glyph); // collapse all sub uls - shapeTracingWindowContent.find('.model ul ul').toggle(false); + shapeTracingWindowContent.find('ul ul').toggle(false); // tabs events shapeTracingWindowContent.find('.shape-tracing-tabs > li').click(function () { @@ -318,6 +318,11 @@ enableCodeMirror(panel); }); + // template link opens template tab + shapeTracingWindowContent.find('.sgd-t a').click(function () { + $(this).parents('.shape-tracing-meta').find('.shape-tracing-tabs > .template').click() + }); + // activates codemirror on specific textareas var enableCodeMirror = function (target) { // if there is a script, and colorization is not enabled yet, turn it on diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs index 655d7c856..bdee8ea74 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs @@ -96,11 +96,11 @@ namespace Orchard.DesignerTools.Services { context.Shape._Dump = sw.ToString(); } - shape._Definition = descriptor.BindingSource; + shape.Template = descriptor.BindingSource; try { if (_webSiteFolder.FileExists(descriptor.BindingSource)) { - shape._DefinitionContent = _webSiteFolder.ReadFile(descriptor.BindingSource); + shape.TemplateContent = _webSiteFolder.ReadFile(descriptor.BindingSource); } } catch { diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingMeta.cshtml b/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingMeta.cshtml index b54da7524..bd08031c9 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingMeta.cshtml +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingMeta.cshtml @@ -19,19 +19,38 @@
  • Shape
  • Model
  • Placement
    • -
  • Templates
    • -
  • Source
    • +
  • Template
  • HTML
      • -
    • Shape
      @Model.ShapeType
      • -
    • Definition
      @Model.Definition
      • -
    • Display Type
      @(String.IsNullOrEmpty((string)Model.DisplayType) ? T("n/a").Text : Model.DisplayType.ToString())
      • -
    • Position
      @(String.IsNullOrEmpty((string)Model.Position) ? T("n/a").Text : Model.Position.ToString())
      • -
    • Placement Source
      @(String.IsNullOrEmpty((string)Model.PlacementSource) ? T("n/a").Text : Model.PlacementSource.ToString())
      • +
    • Shape
      @Model.ShapeType
      • +
    • Template
      @Model.Template
      • +
    • Display Type
      @(String.IsNullOrEmpty((string)Model.DisplayType) ? T("n/a").Text : Model.DisplayType.ToString())
      • +
    • Position
      @(String.IsNullOrEmpty((string)Model.Position) ? T("n/a").Text : Model.Position.ToString())
      • +
    • Placement
      @(String.IsNullOrEmpty((string)Model.PlacementSource) ? T("n/a").Text : Model.PlacementSource.ToString())
      • +
    • Alternates (@Model.Alternates.Count)
      +
       
      +
        + @foreach(var alternate in Model.Alternates) { + var formatted = @FormatShapeFilename(alternate, WorkContext.CurrentTheme.Id); +
      •  
        @formatted
        • + } +
      +
      • +
    • Wrappers (@Model.Wrappers.Count)
      +
       
      +
        + @foreach(var wrapper in Model.Wrappers) { + if(wrapper != "ShapeTracing_Wrapper") { + var formatted = @FormatShapeFilename(wrapper, WorkContext.CurrentTheme.Id); +
      •  
        @formatted
        • + } + } +
      +
    @@ -45,27 +64,8 @@
    - - -