jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: menu separators & text placeholder

Browse Source
This commit is contained in:
Gary Sharp
2013-12-26 11:53:02 +11:00
parent 35391ad1a1
commit 2ddf4b7bd9
12 changed files with 64 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Shared/_Layout.cshtml
-3
View File
@@ -79,14 +79,11 @@
}
</ul>
</li>
<li class="sep"></li>
<li>@Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2")</li>
<li class="sep"></li>
<li>@Html.ActionLink("Users", MVC.User.Index(), accesskey: "3")</li>
<li class="moveRight">@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
@if (Authorization.Has(Claims.Config.Show))
{
<li class="sep"></li>
<li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
}
</ul>
Disco.Web/Views/Shared/_Layout.generated.cs
+26 -40
View File
@@ -515,27 +515,19 @@ WriteLiteral("</li>\r\n");
#line default
#line hidden
WriteLiteral(" </ul>\r\n </li>\r\n <li" +
"");
WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n <li>");
">");
#line 83 "..\..\Views\Shared\_Layout.cshtml"
#line 82 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2"));
#line default
#line hidden
WriteLiteral("</li>\r\n <li");
WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n <li>");
WriteLiteral("</li>\r\n <li>");
#line 85 "..\..\Views\Shared\_Layout.cshtml"
#line 83 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3"));
@@ -548,7 +540,7 @@ WriteLiteral(" class=\"moveRight\"");
WriteLiteral(">");
#line 86 "..\..\Views\Shared\_Layout.cshtml"
#line 84 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
@@ -557,29 +549,23 @@ WriteLiteral(">");
WriteLiteral("</li>\r\n");
#line 87 "..\..\Views\Shared\_Layout.cshtml"
#line 85 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 87 "..\..\Views\Shared\_Layout.cshtml"
#line 85 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Config.Show))
{
#line default
#line hidden
WriteLiteral(" <li");
WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n");
WriteLiteral(" <li>");
#line 90 "..\..\Views\Shared\_Layout.cshtml"
#line 87 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
@@ -588,7 +574,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 91 "..\..\Views\Shared\_Layout.cshtml"
#line 88 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -601,21 +587,21 @@ WriteLiteral(" id=\"headerMenu\"");
WriteLiteral(">\r\n <span>");
#line 95 "..\..\Views\Shared\_Layout.cshtml"
#line 92 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.User.Show))
{
#line default
#line hidden
#line 96 "..\..\Views\Shared\_Layout.cshtml"
#line 93 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id)));
#line default
#line hidden
#line 96 "..\..\Views\Shared\_Layout.cshtml"
#line 93 "..\..\Views\Shared\_Layout.cshtml"
}
else
{
@@ -623,14 +609,14 @@ WriteLiteral(">\r\n <span>");
#line default
#line hidden
#line 98 "..\..\Views\Shared\_Layout.cshtml"
#line 95 "..\..\Views\Shared\_Layout.cshtml"
Write(CurrentUser.ToString());
#line default
#line hidden
#line 98 "..\..\Views\Shared\_Layout.cshtml"
#line 95 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
@@ -638,27 +624,27 @@ WriteLiteral(">\r\n <span>");
WriteLiteral("</span>\r\n");
#line 99 "..\..\Views\Shared\_Layout.cshtml"
#line 96 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 99 "..\..\Views\Shared\_Layout.cshtml"
#line 96 "..\..\Views\Shared\_Layout.cshtml"
using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
{
#line default
#line hidden
#line 100 "..\..\Views\Shared\_Layout.cshtml"
#line 97 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s" }));
#line default
#line hidden
#line 100 "..\..\Views\Shared\_Layout.cshtml"
#line 97 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -671,7 +657,7 @@ WriteLiteral(" id=\"layout_PageHeading\"");
WriteLiteral(">");
#line 103 "..\..\Views\Shared\_Layout.cshtml"
#line 100 "..\..\Views\Shared\_Layout.cshtml"
Write(CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty));
@@ -686,7 +672,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 105 "..\..\Views\Shared\_Layout.cshtml"
#line 102 "..\..\Views\Shared\_Layout.cshtml"
Write(RenderBody());
@@ -695,7 +681,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </section>\r\n <footer>\r\n Disco v");
#line 108 "..\..\Views\Shared\_Layout.cshtml"
#line 105 "..\..\Views\Shared\_Layout.cshtml"
Write(Disco.Web.DiscoApplication.Version);
@@ -706,7 +692,7 @@ WriteLiteral(" ");
WriteLiteral("@ ");
#line 108 "..\..\Views\Shared\_Layout.cshtml"
#line 105 "..\..\Views\Shared\_Layout.cshtml"
Write(Disco.Web.DiscoApplication.OrganisationName);
@@ -716,7 +702,7 @@ WriteLiteral(" | <a\r\n href=\"https://discoict.com.au/\" target=
"om.au</a> | ");
#line 109 "..\..\Views\Shared\_Layout.cshtml"
#line 106 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
@@ -725,7 +711,7 @@ WriteLiteral(" | <a\r\n href=\"https://discoict.com.au/\" target=
WriteLiteral(" | ");
#line 109 "..\..\Views\Shared\_Layout.cshtml"
#line 106 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
@@ -734,13 +720,13 @@ WriteLiteral(" | ");
WriteLiteral("\r\n </footer>\r\n </div>\r\n");
#line 112 "..\..\Views\Shared\_Layout.cshtml"
#line 109 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 112 "..\..\Views\Shared\_Layout.cshtml"
#line 109 "..\..\Views\Shared\_Layout.cshtml"
Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this);
#line default
Disco.Web/Views/Shared/_PublicLayout.cshtml
+2 -3
View File
@@ -19,9 +19,8 @@
</div>
<nav>
<ul id="menu">
<li>@Html.ActionLink("Public Reports", MVC.Public.Public.Index())</li>
<li class="sep"></li>
<li>@Html.ActionLink("Disco Administration", MVC.Job.Index(), accesskey: "1")</li>
<li>@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
<li>@Html.ActionLink("Administration", MVC.Job.Index(), accesskey: "1")</li>
</ul>
</nav>
</header>
Disco.Web/Views/Shared/_PublicLayout.generated.cs
+12 -16
View File
@@ -129,20 +129,16 @@ WriteLiteral(">\r\n <li>");
#line 22 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Html.ActionLink("Public Reports", MVC.Public.Public.Index()));
Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
#line default
#line hidden
WriteLiteral("</li>\r\n <li");
WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n <li>");
WriteLiteral("</li>\r\n <li>");
#line 24 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Html.ActionLink("Disco Administration", MVC.Job.Index(), accesskey: "1"));
#line 23 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Html.ActionLink("Administration", MVC.Job.Index(), accesskey: "1"));
#line default
@@ -155,7 +151,7 @@ WriteLiteral(" id=\"layout_PageHeading\"");
WriteLiteral(">");
#line 28 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 27 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(CommonHelpers.Breadcrumbs(ViewBag.Title));
@@ -170,7 +166,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 30 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 29 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(RenderBody());
@@ -179,7 +175,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </section>\r\n <footer>\r\n Disco v");
#line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 32 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Disco.Web.DiscoApplication.Version);
@@ -190,7 +186,7 @@ WriteLiteral(" ");
WriteLiteral("@ ");
#line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 32 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Disco.Web.DiscoApplication.OrganisationName);
@@ -199,7 +195,7 @@ WriteLiteral("@ ");
WriteLiteral(" | ");
#line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 32 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
@@ -208,7 +204,7 @@ WriteLiteral(" | ");
WriteLiteral(" | ");
#line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 32 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
@@ -217,13 +213,13 @@ WriteLiteral(" | ");
WriteLiteral("\r\n </footer>\r\n </div>\r\n");
#line 36 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 35 "..\..\Views\Shared\_PublicLayout.cshtml"
#line default
#line hidden
#line 36 "..\..\Views\Shared\_PublicLayout.cshtml"
#line 35 "..\..\Views\Shared\_PublicLayout.cshtml"
Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this);
#line default