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/ClientSource/Style/BundleSite.css
-6
View File
@@ -3058,12 +3058,6 @@ header nav ul#menu > li,
display: inline-block;
z-index: 100000;
}
header nav ul#menu > li.sep:after,
#header nav ul#menu > li.sep:after {
padding: 4px 0;
color: #ffffff;
content: '\007C';
}
header nav ul#menu > li.moveRight,
#header nav ul#menu > li.moveRight {
margin-left: 40px;
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Site.css
-6
View File
@@ -134,12 +134,6 @@ header nav ul#menu > li,
display: inline-block;
z-index: 100000;
}
header nav ul#menu > li.sep:after,
#header nav ul#menu > li.sep:after {
padding: 4px 0;
color: #ffffff;
content: '\007C';
}
header nav ul#menu > li.moveRight,
#header nav ul#menu > li.moveRight {
margin-left: 40px;
Disco.Web/ClientSource/Style/Site.less
-6
View File
@@ -60,12 +60,6 @@ header, #header {
display: inline-block;
z-index: 100000;
&.sep:after {
padding: 4px 0;
color: @white;
content: '\007C';
}
&.moveRight {
margin-left: 40px;
}
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Disco.Web.csproj
+1 -2
View File
@@ -1911,7 +1911,6 @@
<ItemGroup>
<Folder Include="Areas\API\Models\WirelessCertificate\" />
<Folder Include="Areas\Services\Models\" />
<Folder Include="Content\" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
@@ -1964,7 +1963,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web/Views/Job/JobParts/Resources.cshtml
+1 -1
View File
@@ -38,7 +38,7 @@
@if (canAddLogs)
{
<div class="commentInput clearfix">
<textarea class="commentInput" accesskey="l"></textarea>
<textarea class="commentInput" placeholder="write comment..." accesskey="l"></textarea>
<span class="action post commentInputPost fa fa-comment" title="Post Comment"></span>
</div>
}
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+20 -18
View File
@@ -258,6 +258,8 @@ WriteLiteral(">\r\n <textarea");
WriteLiteral(" class=\"commentInput\"");
WriteLiteral(" placeholder=\"write comment...\"");
WriteLiteral(" accesskey=\"l\"");
WriteLiteral("></textarea>\r\n <span");
@@ -298,14 +300,14 @@ WriteLiteral(" <td");
WriteLiteral(" id=\"Attachments\"");
WriteAttribute("class", Tuple.Create(" class=\"", 2536), Tuple.Create("\"", 2611)
WriteAttribute("class", Tuple.Create(" class=\"", 2567), Tuple.Create("\"", 2642)
#line 49 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2544), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
, Tuple.Create(Tuple.Create("", 2575), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
#line default
#line hidden
, 2544), false)
, 2575), false)
);
WriteLiteral(">\r\n <div");
@@ -330,14 +332,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 2779), Tuple.Create("\"", 2836)
WriteAttribute("href", Tuple.Create(" href=\"", 2810), Tuple.Create("\"", 2867)
#line 53 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2786), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
, Tuple.Create(Tuple.Create("", 2817), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
#line default
#line hidden
, 2786), false)
, 2817), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -366,42 +368,42 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2942), Tuple.Create("\"", 2962)
WriteAttribute("title", Tuple.Create(" title=\"", 2973), Tuple.Create("\"", 2993)
#line 54 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2950), Tuple.Create<System.Object, System.Int32>(ja.Filename
, Tuple.Create(Tuple.Create("", 2981), Tuple.Create<System.Object, System.Int32>(ja.Filename
#line default
#line hidden
, 2950), false)
, 2981), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 3029), Tuple.Create("\"", 3088)
WriteAttribute("src", Tuple.Create(" src=\"", 3060), Tuple.Create("\"", 3119)
#line 55 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3035), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
, Tuple.Create(Tuple.Create("", 3066), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
#line default
#line hidden
, 3035), false)
, 3066), false)
);
WriteLiteral(" /></span>\r\n <span");
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3151), Tuple.Create("\"", 3171)
WriteAttribute("title", Tuple.Create(" title=\"", 3182), Tuple.Create("\"", 3202)
#line 56 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3159), Tuple.Create<System.Object, System.Int32>(ja.Comments
, Tuple.Create(Tuple.Create("", 3190), Tuple.Create<System.Object, System.Int32>(ja.Comments
#line default
#line hidden
, 3159), false)
, 3190), false)
);
WriteLiteral(">\r\n");
@@ -485,14 +487,14 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3776), Tuple.Create("\"", 3814)
WriteAttribute("title", Tuple.Create(" title=\"", 3807), Tuple.Create("\"", 3845)
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3784), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 3815), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
#line default
#line hidden
, 3784), false)
, 3815), false)
);
WriteLiteral(">");
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