From 2cf2931745986f694d9482914c64580717c795bf Mon Sep 17 00:00:00 2001 From: Jonathan Wall Date: Tue, 20 Jul 2010 11:22:53 -0700 Subject: [PATCH] Added toggle for admin menu. Some work needed to make generic. --HG-- branch : dev --- src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js | 6 ++++++ .../Themes/TheAdmin/Styles/images/menuClosed.gif | Bin 0 -> 1206 bytes .../TheAdmin/Styles/images/menuClosedHover.gif | Bin 0 -> 1191 bytes .../Themes/TheAdmin/Styles/images/menuOpen.gif | Bin 0 -> 1206 bytes .../TheAdmin/Styles/images/menuOpenHover.gif | Bin 0 -> 1191 bytes src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 15 ++++++++++++++- .../Themes/TheAdmin/Views/Layout.ascx | 1 + src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx | 2 +- 8 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js create mode 100644 src/Orchard.Web/Themes/TheAdmin/Styles/images/menuClosed.gif create mode 100644 src/Orchard.Web/Themes/TheAdmin/Styles/images/menuClosedHover.gif create mode 100644 src/Orchard.Web/Themes/TheAdmin/Styles/images/menuOpen.gif create mode 100644 src/Orchard.Web/Themes/TheAdmin/Styles/images/menuOpenHover.gif diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js new file mode 100644 index 000000000..31c9ae137 --- /dev/null +++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js @@ -0,0 +1,6 @@ +$(document).ready(function(){ +$("#navigation li span").click(function() { +$(this).next().next().slideToggle(600); +return false; + }); +}); diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuClosed.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuClosed.gif new file mode 100644 index 0000000000000000000000000000000000000000..f4f5884ea1172f96d2763c7018abd1e69077b470 GIT binary patch literal 1206 zcmZ?wbhEHb3>5!!NB9OPxFnV&0%;rj zih{)C?9>v4q}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7 z*i=|m)9WTXpJp<7&;SCUwvn^&w1Gr=XbIJqdZ zpd>RtPXT0NVp4u-iLDaQr4TRV7Wn$Y4bCgp1A9m>IX_pwBC$Z$_ zi>(q+MlU5Z#mdOp#L~^o!pO+N(!|Bh(9puw&CSWp#M#No#lYOs+ze(0HoZW7PEKx) zMwTW<7KVl{Zk86t20(32MrH=i#xAY~Fuk66#U+V($*C}VGlBL(^%~;UYvo*&npl!w z6q28x14{t`8Tlpo#Toep3eLf%3gMY~Df#8apvZyv)g`qkvn(~mttdZN0UWwknOJN$ zav|hvh~5-(LQEg%7=2LEKuRhwAz=CgG2sax$bn~_)I4B*DFS8;#{d8R{`vju=a28- zzJB@q>Enm@@7}(7{p#h5=g*!#dHm?%gZuaH-no72=8fyuu3ou(>Eea+=gyuved^?i z(;JWy=vu(<;#{XS-fcBg8B32&Y3-H z=8WmnrcRkWY2t+bzTTehuFj73w$_&BrpAW)y4srRs>+J;veJ^`qQZjwyxg4Ztjvt` zwA7U3q{M{yxY(HJsK|)$u+Wg;puhlsKVKhjFHaA5H&+*DCr1Z+J6juTD@zM=GgA{| zBVeY~)78<|($r8_Q&mw`QdE$ala-N{l9Uh^6BQ8_5)|O)PzOq=?o0k00#D_ AE&u=k literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuClosedHover.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuClosedHover.gif new file mode 100644 index 0000000000000000000000000000000000000000..f1fbdc6d8c347cf826cd27e6293d5195da4d7c23 GIT binary patch literal 1191 zcmZ?wbhEHbWS005B~rEU-3V8gl~X?OJYePkhZa}C`e4sPAySL zN=?tqvsHS(d%u!GW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aRO@&oOZb5Ep zNuokUZcbjYRfVlmVoH8esuhq864qBz04piUwpDTjNhpBqbj~kIRWQ{v&`mZlGf*%y z)H5_TF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=| zef{$Ca=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~> zCgqow*eU^C3h_d2fv+#z;Jjizu!r=L^KSknJ0o7b;izIguZ>66Eg9zM8#@9v%3w{G6Je(ma&%a<-*IDhW!nbW6Eo;ZH&=#j&R z4j$OQZ||PnyLRr_zHRH4&6_rESif%Vn$@dTu2{Zo>5|2Z7A}}SZ|F(<6Xm4w6X>Mw4sIRN7sjjN5C@(85DK083$j{5o$mNlr>k zh>weniH?el2oDPl2@VPj@b~le@%HlcaCdWcadvWau(z|dv9_|bFgG(bF*X8bNqwaWPR5VIe^Qem-6vZZ1v^b~aWPW+p}k2F0H&K$4k3 qhXDvcr4Iv>)E%K^+7njKY8Lddda`&H+iuPKM;ju9jhMn17_0&QQKC@* literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuOpen.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuOpen.gif new file mode 100644 index 0000000000000000000000000000000000000000..1a761a88bd1c3503aae3921e4be3393f2fc26b31 GIT binary patch literal 1206 zcmZ?wbhEHb3>5!!NB9OPxFnV&0%;rj zih{)C?9>v4q}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7 z*i=|m)9WTXpJp<7&;SCUwvn^&w1Gr=XbIJqdZ zpd>RtPXT0NVp4u-iLDaQr4TRV7Wn$Y4bCgp1A9m>IX_pwBC$Z$_ zi>(q+MlU5Z#mdOp#L~^o!pO+N(!|Bh(9puw&CSWp#M#No#lYOs+ze(0HoY#!PNqht z#;%qoMiz#KE^d|vmWIx*CdNi?uI6qgj)pM3o_WP3iFwJXFncqB_Coc#;MHs8T$Gwv zl3x^(pPvIu0Rb8LCHch}`2`Bj!KMn~nRzMs<;9@Lf%w%WwJ5VJHN~wcKUV=9x>lK3 zY&UWtyv|Nj2@{p;tC z@87({PcxqRv3h4bgmo;iK$ z#u35cm<%;FYmM&SmXyJnS^XAT( zJ!|HS>C>i8nLKIYg#NzXp6;&Bj`p_Jmgc6$hWfhNn(C^`it@73lH#Jmg8aPPob0U3 zjP$hBl;otug!s7FnCPg;i14t`kl>)e0DnJUA8#*D4|g|L7iT9&2YWkP8*3{|3v)A5 zU}^wnNqwaWPR5VIe^Qem-6vZZ1v^b~aWPW+p}k z2F0H&K$4X~2UOO8N+Jek*@#_t;uN=WGzla`#xOj*HbHZqK%cj!-GN^v`8w(h)&PhW BrOf~U literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuOpenHover.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/menuOpenHover.gif new file mode 100644 index 0000000000000000000000000000000000000000..711dc85f52e6d21b781e1cda4fccbe63d4bca188 GIT binary patch literal 1191 zcmZ?wbhEHbWS005B~rEU-3V8gl~X?OJYePkhZa}C`e4sPAySL zN=?tqvsHS(d%u!GW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aRO@&oOZb5Ep zNuokUZcbjYRfVlmVoH8esuhq864qBz04piUwpDTjNhpBqbj~kIRWQ{v&`mZlGf*%y z)H5_TF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=| zef{$Ca=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~> zCgqow*eU^C3h_d2fv+#z;Jjizu!r=L^KnJ0o7b;izIguZ>66Eg9zM8#@9v%3w{G6Je(ma&%a<-*IDhW!nbW6Eo;ZH&=#j&R z4j$OQZ||PnyLRr_zHRH4&6_rESif%Vn$@dTu2{Zo>5|2Z7A}}SZ|F(<6Xm4w6X>Mw4sIRN7sjjN5C@(85DK083$j{5o$mNlr>k zh>weniH?el2oDPl2@VPj@b~le@%HlcaCdWcadvWau(z|dv9_|bFgG(bF*X8bNqwaWPR5VIe^Qem-6vZZ1v^b~aWPW+p}k2F0H&K$4k3 rhXDvcr4Iv>)SUj6%5!B|7#@099a^(pinoNbLvz;l1*cDmF<1itU(KT5 literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 3aedae27f..8ac3c7b37 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -239,7 +239,7 @@ form.link button:hover { width:0; } #navigation li { - margin:7px 0 20px 0; + margin:7px 0 20px 4px; } #navigation ul li { border:0; @@ -270,6 +270,19 @@ form.link button:hover { text-decoration:underline; } +/* todo: make generic so all toggles can use this and clean up jQuery */ +.menuGlyph { +display:block; +height:11px; +width:11px; +margin:0 0 -22px -8px; +background:url("images/menuOpen.gif") no-repeat center top; +} +.menuGlyph:hover { +background:url("images/menuOpenHover.gif") no-repeat center top; +cursor:pointer; +} + /* Content ----------------------------------------------------------*/ #main h1 { diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx index 5788e69a2..032e2f475 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx @@ -8,6 +8,7 @@ Model.Zones.AddRenderPartial("header", "Header", Model); Model.Zones.AddRenderPartial("header:after", "User", Model); // todo: (heskew) should be a user display or widget Model.Zones.AddRenderPartial("menu", "Menu", Model); %> +
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx index 5cb2c2a2a..ae65161c3 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx @@ -15,7 +15,7 @@ classification += "last "; %> - >

<%=sectionHeaderMarkup %>

    <%foreach (var menuItem in menuSection.Items) { %> + >

    <%=sectionHeaderMarkup %>

      <%foreach (var menuItem in menuSection.Items) { %>
    • <%: Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues)%>
      • <%} %>
    <%