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

Update: FontAwesome Pass 2

Browse Source 
Removal of bitmap icons, replacing with vector based icons from
FontAwesome. Includes other UI style changes.
This commit is contained in:
Gary Sharp
2013-12-25 17:49:30 +11:00
parent 20263905f9
commit ab553a05cb
115 changed files with 1928 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/App_Code/AjaxHelpers.cshtml
+14 -17
View File
@@ -3,30 +3,27 @@
@using Disco.Web;
@using Disco.Services.Web;
@helper AjaxLoader(string id = null)
{
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
<span @(id!=null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty)) class="ajaxHelperIcon ajaxLoading" title="Loading..."></span><span @(id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : new HtmlString(string.Empty)) class="ajaxHelperIcon ajaxOk"
title="Ok"></span>
{
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
<i @(id != null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty)) class="ajaxLoading" title="Loading..."></i><i @(id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : null) class="fa fa-check fa-lg hidden ajaxOk" title="Ok"></i>
}
@helper AjaxSave()
{
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
<span class="ajaxHelperIcon ajaxSave" title="Save Changes"></span>
{
<i class="fa fa-check-square fa-lg hidden ajaxSave" title="Save Changes"></i>
}
@helper AjaxRemove()
{
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
<span class="ajaxHelperIcon ajaxRemove" title="Remove"></span>
{
<i class="fa fa-times-circle fa-lg hidden ajaxRemove" title="Remove"></i>
}
@helper JsonDate(DateTime? date)
{
if (date.HasValue)
{
if (date.HasValue)
{
var d = date.Value;
var d = date.Value;
@(new HtmlString(string.Format("new Date({0}, {1}, {2}, {3}, {4}, {5})", d.Year, d.Month - 1, d.Day, d.Hour, d.Minute, d.Second)))
}
else
{
}
else
{
@(new HtmlString("null"))
}
}
}
Disco.Web/App_Code/AjaxHelpers.generated.cs
+35 -36
View File
@@ -47,47 +47,47 @@ namespace Disco.Web
{
public static System.Web.WebPages.HelperResult AjaxLoader(string id = null)
{
{
return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 6 "..\..\App_Code\AjaxHelpers.cshtml"
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line default
#line hidden
WriteLiteralTo(@__razor_helper_writer, " <span ");
WriteLiteralTo(@__razor_helper_writer, " <i ");
#line 8 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, id!=null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty));
WriteTo(@__razor_helper_writer, id != null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty));
#line default
#line hidden
WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxHelperIcon ajaxLoading\" title=\"Loading...\"></span>");
WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxLoading\" title=\"Loading...\"></i>");
WriteLiteralTo(@__razor_helper_writer, "<span ");
WriteLiteralTo(@__razor_helper_writer, "<i ");
#line 8 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : new HtmlString(string.Empty));
WriteTo(@__razor_helper_writer, id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : null);
#line default
#line hidden
WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxHelperIcon ajaxOk\"\r\n title=\"Ok\"></span>\r\n");
WriteLiteralTo(@__razor_helper_writer, " class=\"fa fa-check fa-lg hidden ajaxOk\" title=\"Ok\"></i>\r\n");
#line 10 "..\..\App_Code\AjaxHelpers.cshtml"
#line 9 "..\..\App_Code\AjaxHelpers.cshtml"
#line default
#line hidden
@@ -98,23 +98,23 @@ WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxHelperIcon ajaxOk\"\r\n
public static System.Web.WebPages.HelperResult AjaxSave()
{
{
return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 12 "..\..\App_Code\AjaxHelpers.cshtml"
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line 11 "..\..\App_Code\AjaxHelpers.cshtml"
#line default
#line hidden
WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxSave\" title=\"Save Changes\"></span>\r\n");
WriteLiteralTo(@__razor_helper_writer, " <i class=\"fa fa-check-square fa-lg hidden ajaxSave\" title=\"Save Changes\"></i>" +
"\r\n");
#line 15 "..\..\App_Code\AjaxHelpers.cshtml"
#line 13 "..\..\App_Code\AjaxHelpers.cshtml"
#line default
#line hidden
@@ -125,23 +125,22 @@ WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxSav
public static System.Web.WebPages.HelperResult AjaxRemove()
{
{
return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 17 "..\..\App_Code\AjaxHelpers.cshtml"
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line 15 "..\..\App_Code\AjaxHelpers.cshtml"
#line default
#line hidden
WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxRemove\" title=\"Remove\"></span>\r\n");
WriteLiteralTo(@__razor_helper_writer, " <i class=\"fa fa-times-circle fa-lg hidden ajaxRemove\" title=\"Remove\"></i>\r\n");
#line 20 "..\..\App_Code\AjaxHelpers.cshtml"
#line 17 "..\..\App_Code\AjaxHelpers.cshtml"
#line default
#line hidden
@@ -152,48 +151,48 @@ WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxRem
public static System.Web.WebPages.HelperResult JsonDate(DateTime? date)
{
{
return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 22 "..\..\App_Code\AjaxHelpers.cshtml"
if (date.HasValue)
{
var d = date.Value;
#line 19 "..\..\App_Code\AjaxHelpers.cshtml"
if (date.HasValue)
{
var d = date.Value;
#line default
#line hidden
#line 26 "..\..\App_Code\AjaxHelpers.cshtml"
#line 23 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, new HtmlString(string.Format("new Date({0}, {1}, {2}, {3}, {4}, {5})", d.Year, d.Month - 1, d.Day, d.Hour, d.Minute, d.Second)));
#line default
#line hidden
#line 26 "..\..\App_Code\AjaxHelpers.cshtml"
#line 23 "..\..\App_Code\AjaxHelpers.cshtml"
}
else
{
}
else
{
#line default
#line hidden
#line 30 "..\..\App_Code\AjaxHelpers.cshtml"
#line 27 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, new HtmlString("null"));
#line default
#line hidden
#line 30 "..\..\App_Code\AjaxHelpers.cshtml"
#line 27 "..\..\App_Code\AjaxHelpers.cshtml"
}
}
#line default
#line hidden