diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.ascx b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.ascx index ffb36e9e3..370d786a2 100644 --- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.ascx +++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.ascx @@ -4,6 +4,8 @@
<%=Html.EditorFor(m => m.OnMainMenu) %> - - <%=Html.TextBoxFor(m => m.MenuText, new { @class = "large text" })%> +
+ + <%=Html.TextBoxFor(m => m.MenuText, new { @class = "large text" })%> +
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index fd05e3d8f..97b36865a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -232,6 +232,7 @@ + diff --git a/src/Orchard.Web/Core/Themes/Scripts/base.js b/src/Orchard.Web/Core/Themes/Scripts/base.js new file mode 100644 index 000000000..50b52a05f --- /dev/null +++ b/src/Orchard.Web/Core/Themes/Scripts/base.js @@ -0,0 +1,30 @@ +jQuery.fn.extend({ + toggleWhatYouControl: function() { + var _controller = $(this); + var _controllees = $("[data-controllerid=" + _controller.attr("id") + "]"); + if (_controller.is(":checked")) { + $(_controllees.slideDown(200)[0]).find("input").focus(); + } else { + _controllees.slideUp(200); + } + } +}); +(function() { + $("[data-controllerid]").each(function() { + var controller = $("#" + $(this).attr("data-controllerid")); + if (!controller.is(":checked")) { + $("[data-controllerid=" + controller.attr("id") + "]").hide(); + } + if (controller.is(":checkbox")) { + controller.change(function() { + $(this).toggleWhatYouControl(); + }); + } else if (controller.is(":radio")) { + $("[name=" + controller.attr("name") + "]").change(function() { + $("[name=" + $(this).attr("name") + "]").each(function() { + $(this).toggleWhatYouControl(); + }); + }); + } + }); +})(); \ No newline at end of file diff --git a/src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx b/src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx index 9ae12461c..75eb71bb8 100644 --- a/src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx +++ b/src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx @@ -3,4 +3,5 @@ if (Request.IsAuthenticated) { Html.RegisterStyle("special.css"); } Html.RegisterScript("jquery-1.4.1.js"); // <- change to .min.js for use on a real site :) +Html.RegisterFootScript("base.js"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx index 97243bb21..fa5247e64 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx @@ -12,12 +12,12 @@ <%=Html.ValidationMessage("EnableSpamProtection", "*")%> -
+
<%=Html.EditorFor(m => m.AkismetKey) %> <%=Html.ValidationMessage("AkismetKey", "*")%>
-
+
<%=Html.EditorFor(m => m.AkismetUrl) %> <%=Html.ValidationMessage("AkismetUrl", "*")%> diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx index 450a52095..f87b48449 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx @@ -20,7 +20,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.PasswordFor(svm => svm.AdminPassword) %>
-
"> +
<%=_Encoded("How would you like to store your data?") %> <%=Html.ValidationMessage("DatabaseOptions", "Unable to setup data storage") %>
@@ -30,20 +30,14 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.RadioButtonFor(svm => svm.DatabaseOptions, false, new { id = "sql" })%> - + <%=Html.EditorFor(svm => svm.DatabaseConnectionString)%> - <%=_Encoded("Example: Data Source=sqlServerName;Initial Catalog=dbName;Persist Security Info=True;User ID=userName;Password=password") %> + <%=_Encoded("Example:") %>
<%=_Encoded("Data Source=sqlServerName;Initial Catalog=dbName;Persist Security Info=True;User ID=userName;Password=password") %>
" />
<% -} %> - \ No newline at end of file +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/site.css b/src/Orchard.Web/Themes/SafeMode/Styles/site.css index 981b2801d..2de026cef 100644 --- a/src/Orchard.Web/Themes/SafeMode/Styles/site.css +++ b/src/Orchard.Web/Themes/SafeMode/Styles/site.css @@ -35,7 +35,10 @@ h3 {font-size: 130%;} h4 {font-size: 120%;} h5 {font-size: 105%;} - +.hint { + font-size:60%; + font-style:italic; +} #header { background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right; @@ -48,7 +51,7 @@ h5 {font-size: 105%;} background:url(images/orchardLogo.gif) no-repeat; display:block; height:60px; - margin:0 0 0 20px;; + margin:0 0 0 20px; } @@ -146,10 +149,6 @@ button:focus, .button:focus { text-decoration:none; } -html.dyn fieldset.data.builtin div span { - display:none; -} - /* Confirmations, Messages and the like ----------------------------------------------------------*/ diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx index 7883ab83b..03a6412ee 100644 --- a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx @@ -4,10 +4,13 @@ <% //todo: (heskew) this should really be using the IResourceManager if it's to be a theme especially for the jquery dep (w/out needing to copy into this theme...) var jquery = ResolveUrl("~/Core/Themes/Scripts/jquery-1.4.1.js"); Model.Zones.AddAction("head:scripts", html => - html.ViewContext.Writer.Write(@"")); + html.ViewContext.Writer.Write(@"")); + var basejs = ResolveUrl("~/Core/Themes/Scripts/base.js"); + Model.Zones.AddAction("content:after", html => + html.ViewContext.Writer.Write(@"")); var siteCss = ResolveUrl("../Styles/site.css"); Model.Zones.AddAction("head:styles", html => - html.ViewContext.Writer.Write(@"")); %> + html.ViewContext.Writer.Write(@"")); %>