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

Feature: FontAwesome Added

Browse Source 
FontAwesome 4.0.3.1 Added, and an initial pass to replace bitmap icons.
This commit is contained in:
Gary Sharp
2013-12-24 16:22:26 +11:00
parent f1ee2937cd
commit 20263905f9
63 changed files with 3682 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+3 -3
View File
@@ -32,7 +32,7 @@
else
{ @da.Comments }}
</span><span class="author">@da.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && da.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.FromNow()</span>
</a>
}
}
@@ -40,7 +40,7 @@
@if (canAddAttachments)
{
<div class="attachmentInput clearfix">
<span class="action upload"></span><span class="action photo"></span>
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
</div>
}
<script type="text/javascript">
@@ -144,7 +144,7 @@
function buildAttachment(a, canRemove, quick) {
var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
if (canRemove)
t += '<span class="remove"></span>';
t += '<span class="remove fa fa-times-circle"></span>';
t += '<span class="timestamp"></span></a>';
var e = $(t);
Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+13 -9
View File
@@ -252,13 +252,13 @@ WriteLiteral("</span>");
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>");
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
}
}
#line default
#line hidden
@@ -266,21 +266,21 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2125), Tuple.Create("\"", 2163)
WriteAttribute("title", Tuple.Create(" title=\"", 2144), Tuple.Create("\"", 2182)
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2133), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 2152), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
#line default
#line hidden
, 2133), false)
, 2152), false)
);
WriteLiteral(">");
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
Write(da.Timestamp.FromNow());
Write(da.Timestamp.FromNow());
#line default
@@ -317,11 +317,15 @@ WriteLiteral(" class=\"attachmentInput clearfix\"");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"action upload\"");
WriteLiteral(" class=\"action upload fa fa-upload\"");
WriteLiteral(" title=\"Attach File\"");
WriteLiteral("></span><span");
WriteLiteral(" class=\"action photo\"");
WriteLiteral(" class=\"action photo fa fa-camera\"");
WriteLiteral(" title=\"Capture Image\"");
WriteLiteral("></span>\r\n </div>\r\n");
@@ -551,7 +555,7 @@ WriteLiteral(" class=\"author\"");
WriteLiteral("></span>\';\r\n if (canRemove)\r\n " +
" t += \'<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>\';\r\n t += \'<span");
Disco.Web/Views/Job/JobParts/Components.cshtml
+2 -2
View File
@@ -34,7 +34,7 @@
<input type="text" class="cost" value="@jc.Cost.ToString("C")" />
</td>
<td>
<span class="remove"></span>
<span class="remove fa fa-times-circle"></span>
</td>
</tr>
}
@@ -90,7 +90,7 @@
$jobComponents.on('click', 'span.remove', removeComponent);
$('#jobComponentsAdd').click(function () {
var jc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="remove"></span></td></tr>');
var jc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="remove fa fa-times-circle"></span></td></tr>');
jc.find('input').focus(function () { $(this).select() })
jc.insertBefore($jobComponents.find('tr').last());
jc.find('input.description').focus();
Disco.Web/Views/Job/JobParts/Components.generated.cs
+20 -20
View File
@@ -158,7 +158,7 @@ WriteAttribute("value", Tuple.Create(" value=\"", 966), Tuple.Create("\"", 996)
WriteLiteral(" />\r\n </td>\r\n <td>\r\n <span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>\r\n </td>\r\n </tr>\r\n");
@@ -256,14 +256,14 @@ WriteLiteral(">Add Component</a>\r\n");
#line hidden
WriteLiteral(" &nbsp;\r\n </td>\r\n <td");
WriteAttribute("colspan", Tuple.Create(" colspan=\"", 1708), Tuple.Create("\"", 1736)
WriteAttribute("colspan", Tuple.Create(" colspan=\"", 1727), Tuple.Create("\"", 1755)
#line 65 "..\..\Views\Job\JobParts\Components.cshtml"
, Tuple.Create(Tuple.Create("", 1718), Tuple.Create<System.Object, System.Int32>(hasEdit ? 2 : 1
, Tuple.Create(Tuple.Create("", 1737), Tuple.Create<System.Object, System.Int32>(hasEdit ? 2 : 1
#line default
#line hidden
, 1718), false)
, 1737), false)
);
WriteLiteral(" class=\"totalCost\"");
@@ -337,22 +337,22 @@ WriteLiteral(">\r\n $(function () {\r\n var $jobComponents = $
" $jobComponents.on(\'click\', \'span.remove\', removeComponent);\r\n\r\n " +
" $(\'#jobComponentsAdd\').click(function () {\r\n var jc = $(\'<" +
"tr><td><input type=\"text\" class=\"description\" /></td><td><input type=\"text\" clas" +
"s=\"cost\" /></td><td><span class=\"remove\"></span></td></tr>\');\r\n j" +
"c.find(\'input\').focus(function () { $(this).select() })\r\n jc.inse" +
"rtBefore($jobComponents.find(\'tr\').last());\r\n jc.find(\'input.desc" +
"ription\').focus();\r\n return false;\r\n });\r\n\r\n " +
" $(\'#dialogRemoveComponent\').dialog({\r\n resizable: false,\r\n " +
" height: 140,\r\n modal: true,\r\n autoOpen:" +
" false\r\n });\r\n\r\n function removeComponent() {\r\n " +
" var componentRow = $(this).closest(\'tr\');\r\n var id = compone" +
"ntRow.attr(\'data-jobcomponentid\');\r\n if (id) {\r\n " +
" var data = { id: id };\r\n\r\n var $dialogRemoveComponent = $(" +
"\'#dialogRemoveComponent\');\r\n $dialogRemoveComponent.dialog(\"e" +
"nable\");\r\n $dialogRemoveComponent.dialog(\'option\', \'buttons\'," +
" {\r\n \"Remove\": function () {\r\n " +
" $dialogRemoveComponent.dialog(\"disable\");\r\n $dialogR" +
"emoveComponent.dialog(\"option\", \"buttons\", null);\r\n $" +
".ajax({\r\n url: \'");
"s=\"cost\" /></td><td><span class=\"remove fa fa-times-circle\"></span></td></tr>\');" +
"\r\n jc.find(\'input\').focus(function () { $(this).select() })\r\n " +
" jc.insertBefore($jobComponents.find(\'tr\').last());\r\n " +
"jc.find(\'input.description\').focus();\r\n return false;\r\n " +
" });\r\n\r\n $(\'#dialogRemoveComponent\').dialog({\r\n resiz" +
"able: false,\r\n height: 140,\r\n modal: true,\r\n " +
" autoOpen: false\r\n });\r\n\r\n function removeCompone" +
"nt() {\r\n var componentRow = $(this).closest(\'tr\');\r\n " +
" var id = componentRow.attr(\'data-jobcomponentid\');\r\n if (id) {" +
"\r\n var data = { id: id };\r\n\r\n var $dialogR" +
"emoveComponent = $(\'#dialogRemoveComponent\');\r\n $dialogRemove" +
"Component.dialog(\"enable\");\r\n $dialogRemoveComponent.dialog(\'" +
"option\', \'buttons\', {\r\n \"Remove\": function () {\r\n " +
" $dialogRemoveComponent.dialog(\"disable\");\r\n " +
" $dialogRemoveComponent.dialog(\"option\", \"buttons\", null);\r\n " +
" $.ajax({\r\n url: \'");
#line 120 "..\..\Views\Job\JobParts\Components.cshtml"
Disco.Web/Views/Job/JobParts/Resources.cshtml
+6 -6
View File
@@ -30,7 +30,7 @@
{
<div data-logid="@jl.Id">
<span class="author">@jl.TechUser.ToString()</span>@if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.FromNow()</span>
<span class="comment">@jl.Comments.ToMultilineJobRefString()</span>
</div>
}
@@ -39,7 +39,7 @@
{
<div class="commentInput clearfix">
<textarea class="commentInput" accesskey="l"></textarea>
<span class="action post commentInputPost" title="Post Comment"></span>
<span class="action post commentInputPost fa fa-comment" title="Post Comment"></span>
</div>
}
</td>
@@ -59,14 +59,14 @@
else
{ @ja.Comments }}
</span><span class="author">@ja.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ja.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.FromNow()</span>
</a>
}
</div>
@if (canAddAttachments)
{
<div class="attachmentInput clearfix">
<span class="action upload" title="Attach File"></span><span class="action photo" title="Capture Image"></span>
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
</div>
}
</td>
@@ -252,7 +252,7 @@
function addComment(c, quick, canRemove) {
var t = '<div><span class="author" />';
if (canRemove)
t += '<span class="remove" />';
t += '<span class="remove fa fa-times-circle" />';
t += '<span class="timestamp" /><span class="comment" /></div>';
var e = $(t);
@@ -465,7 +465,7 @@
if (parseInt(a.ParentId) == jobId) {
var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
if (canRemove)
t += '<span class="remove"></span>';
t += '<span class="remove fa fa-times-circle"></span>';
t += '<span class="timestamp"></span></a>';
var e = $(t);
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+32 -32
View File
@@ -179,13 +179,13 @@ WriteLiteral("</span>");
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>");
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
}
}
#line default
#line hidden
@@ -193,21 +193,21 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1812), Tuple.Create("\"", 1850)
WriteAttribute("title", Tuple.Create(" title=\"", 1831), Tuple.Create("\"", 1869)
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1820), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 1839), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
#line default
#line hidden
, 1820), false)
, 1839), false)
);
WriteLiteral(">");
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(jl.Timestamp.FromNow());
Write(jl.Timestamp.FromNow());
#line default
@@ -262,7 +262,7 @@ WriteLiteral(" accesskey=\"l\"");
WriteLiteral("></textarea>\r\n <span");
WriteLiteral(" class=\"action post commentInputPost\"");
WriteLiteral(" class=\"action post commentInputPost fa fa-comment\"");
WriteLiteral(" title=\"Post Comment\"");
@@ -298,14 +298,14 @@ WriteLiteral(" <td");
WriteLiteral(" id=\"Attachments\"");
WriteAttribute("class", Tuple.Create(" class=\"", 2503), Tuple.Create("\"", 2578)
WriteAttribute("class", Tuple.Create(" class=\"", 2536), Tuple.Create("\"", 2611)
#line 49 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2511), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
, Tuple.Create(Tuple.Create("", 2544), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
#line default
#line hidden
, 2511), false)
, 2544), false)
);
WriteLiteral(">\r\n <div");
@@ -330,14 +330,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 2746), Tuple.Create("\"", 2803)
WriteAttribute("href", Tuple.Create(" href=\"", 2779), Tuple.Create("\"", 2836)
#line 53 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2753), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
, Tuple.Create(Tuple.Create("", 2786), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
#line default
#line hidden
, 2753), false)
, 2786), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -366,42 +366,42 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2909), Tuple.Create("\"", 2929)
WriteAttribute("title", Tuple.Create(" title=\"", 2942), Tuple.Create("\"", 2962)
#line 54 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2917), Tuple.Create<System.Object, System.Int32>(ja.Filename
, Tuple.Create(Tuple.Create("", 2950), Tuple.Create<System.Object, System.Int32>(ja.Filename
#line default
#line hidden
, 2917), false)
, 2950), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 2996), Tuple.Create("\"", 3055)
WriteAttribute("src", Tuple.Create(" src=\"", 3029), Tuple.Create("\"", 3088)
#line 55 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3002), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
, Tuple.Create(Tuple.Create("", 3035), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
#line default
#line hidden
, 3002), false)
, 3035), false)
);
WriteLiteral(" /></span>\r\n <span");
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3118), Tuple.Create("\"", 3138)
WriteAttribute("title", Tuple.Create(" title=\"", 3151), Tuple.Create("\"", 3171)
#line 56 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3126), Tuple.Create<System.Object, System.Int32>(ja.Comments
, Tuple.Create(Tuple.Create("", 3159), Tuple.Create<System.Object, System.Int32>(ja.Comments
#line default
#line hidden
, 3126), false)
, 3159), false)
);
WriteLiteral(">\r\n");
@@ -471,13 +471,13 @@ WriteLiteral("</span>");
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>");
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
}
}
#line default
#line hidden
@@ -485,21 +485,21 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3724), Tuple.Create("\"", 3762)
WriteAttribute("title", Tuple.Create(" title=\"", 3776), Tuple.Create("\"", 3814)
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3732), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 3784), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
#line default
#line hidden
, 3732), false)
, 3784), false)
);
WriteLiteral(">");
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(ja.Timestamp.FromNow());
Write(ja.Timestamp.FromNow());
#line default
@@ -535,13 +535,13 @@ WriteLiteral(" class=\"attachmentInput clearfix\"");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"action upload\"");
WriteLiteral(" class=\"action upload fa fa-upload\"");
WriteLiteral(" title=\"Attach File\"");
WriteLiteral("></span><span");
WriteLiteral(" class=\"action photo\"");
WriteLiteral(" class=\"action photo fa fa-camera\"");
WriteLiteral(" title=\"Capture Image\"");
@@ -927,7 +927,7 @@ WriteLiteral(@"
function addComment(c, quick, canRemove) {
var t = '<div><span class=""author"" />';
if (canRemove)
t += '<span class=""remove"" />';
t += '<span class=""remove fa fa-times-circle"" />';
t += '<span class=""timestamp"" /><span class=""comment"" /></div>';
var e = $(t);
@@ -1281,7 +1281,7 @@ WriteLiteral(@" } else {
if (parseInt(a.ParentId) == jobId) {
var t = '<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span>';
if (canRemove)
t += '<span class=""remove""></span>';
t += '<span class=""remove fa fa-times-circle""></span>';
t += '<span class=""timestamp""></span></a>';
var e = $(t);
Disco.Web/Views/User/UserParts/_Resources.cshtml
+3 -3
View File
@@ -32,7 +32,7 @@
else
{ @ua.Comments }}
</span><span class="author">@ua.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ua.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@ua.Timestamp.ToFullDateTime()">@ua.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@ua.Timestamp.ToFullDateTime()">@ua.Timestamp.FromNow()</span>
</a>
}
}
@@ -40,7 +40,7 @@
@if (canAddAttachments)
{
<div class="attachmentInput clearfix">
<span class="action upload"></span><span class="action photo"></span>
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
</div>
}
<script type="text/javascript">
@@ -140,7 +140,7 @@
function buildAttachment(a, canRemove, quick) {
var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
if (canRemove)
t += '<span class="remove"></span>';
t += '<span class="remove fa fa-times-circle"></span>';
t += '<span class="timestamp"></span></a>';
var e = $(t);
Disco.Web/Views/User/UserParts/_Resources.generated.cs
+13 -9
View File
@@ -252,13 +252,13 @@ WriteLiteral("</span>");
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>");
#line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
}
}
#line default
#line hidden
@@ -266,21 +266,21 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2095), Tuple.Create("\"", 2133)
WriteAttribute("title", Tuple.Create(" title=\"", 2114), Tuple.Create("\"", 2152)
#line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2103), Tuple.Create<System.Object, System.Int32>(ua.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 2122), Tuple.Create<System.Object, System.Int32>(ua.Timestamp.ToFullDateTime()
#line default
#line hidden
, 2103), false)
, 2122), false)
);
WriteLiteral(">");
#line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
Write(ua.Timestamp.FromNow());
Write(ua.Timestamp.FromNow());
#line default
@@ -317,11 +317,15 @@ WriteLiteral(" class=\"attachmentInput clearfix\"");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"action upload\"");
WriteLiteral(" class=\"action upload fa fa-upload\"");
WriteLiteral(" title=\"Attach File\"");
WriteLiteral("></span><span");
WriteLiteral(" class=\"action photo\"");
WriteLiteral(" class=\"action photo fa fa-camera\"");
WriteLiteral(" title=\"Capture Image\"");
WriteLiteral("></span>\r\n </div>\r\n");
@@ -547,7 +551,7 @@ WriteLiteral(" class=\"author\"");
WriteLiteral("></span>\';\r\n if (canRemove)\r\n " +
" t += \'<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>\';\r\n t += \'<span");