Removed extraneous icons

Font Awesomed AddSeries
Font Awesomed gritter
This commit is contained in:
Mark McDowall 2012-10-11 10:25:31 -07:00
parent 6ffb99f84f
commit a3d4b7ed82
36 changed files with 50 additions and 37 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 743 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 800 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 B

View File

@ -193,6 +193,19 @@ button span, input[type="button"] span, input[type="submit"] span, input[type="r
width: auto; width: auto;
} }
.delete-root {
color: red;
}
.delete-root:before {
vertical-align: middle !important;
}
.delete-root:hover {
cursor: pointer !important;
}
/* Local Series Search */
#localSeriesLookup #localSeriesLookup
{ {
width: 220px; width: 220px;

View File

@ -72,6 +72,16 @@
border-color: rgb(212, 44, 44); border-color: rgb(212, 44, 44);
} }
.gritter-success .gritter-icon
{
color: rgb(100, 135, 46);
}
.gritter-fail .gritter-icon
{
color: rgb(212, 44, 44);
}
.hover .gritter-item .hover .gritter-item
{ {
background-position: right -40px; background-position: right -40px;
@ -116,3 +126,9 @@
width: 220px; width: 220px;
float: right; float: right;
} }
.gritter-icon {
font-size: 50px;
float: left;
line-height: 35px;
}

View File

@ -165,12 +165,8 @@
<Content Include="Content\DataTables-1.9.0\media\images\sort_both.png" /> <Content Include="Content\DataTables-1.9.0\media\images\sort_both.png" />
<Content Include="Content\DataTables-1.9.0\media\images\sort_desc.png" /> <Content Include="Content\DataTables-1.9.0\media\images\sort_desc.png" />
<Content Include="Content\DataTables-1.9.0\media\images\sort_desc_disabled.png" /> <Content Include="Content\DataTables-1.9.0\media\images\sort_desc_disabled.png" />
<Content Include="Content\Images\AirsToday.png" />
<Content Include="Content\Images\background.jpg" /> <Content Include="Content\Images\background.jpg" />
<Content Include="Content\Images\blue.png" /> <Content Include="Content\Images\blue.png" />
<Content Include="Content\Images\changequality.png" />
<Content Include="Content\Images\False.png" />
<Content Include="Content\Images\Gear.png" />
<Content Include="Content\Images\green.png" /> <Content Include="Content\Images\green.png" />
<Content Include="Content\Images\Indexers\FileSharingTalk.png" /> <Content Include="Content\Images\Indexers\FileSharingTalk.png" />
<Content Include="Content\Images\Indexers\Newznab.png" /> <Content Include="Content\Images\Indexers\Newznab.png" />
@ -182,14 +178,8 @@
<Content Include="Content\Images\Indexers\WomblesIndex.png" /> <Content Include="Content\Images\Indexers\WomblesIndex.png" />
<Content Include="Content\Images\logo.png" /> <Content Include="Content\Images\logo.png" />
<Content Include="Content\Images\logo_small.png" /> <Content Include="Content\Images\logo_small.png" />
<Content Include="Content\Images\pause.png" />
<Content Include="Content\Images\play.png" />
<Content Include="Content\Images\red.png" /> <Content Include="Content\Images\red.png" />
<Content Include="Content\Images\redownload.png" />
<Content Include="Content\Images\settings.png" />
<Content Include="Content\Images\stop.png" />
<Content Include="Content\Images\thetvdb.png" /> <Content Include="Content\Images\thetvdb.png" />
<Content Include="Content\Images\True.png" />
<Content Include="Content\Images\yellow.png" /> <Content Include="Content\Images\yellow.png" />
<Content Include="Content\IndexerSettings.css" /> <Content Include="Content\IndexerSettings.css" />
<Content Include="Content\jQueryUI\images\ui-bg_diagonals-thick_30_a32d00_40x40.png" /> <Content Include="Content\jQueryUI\images\ui-bg_diagonals-thick_30_a32d00_40x40.png" />
@ -208,18 +198,9 @@
<Content Include="Content\jQueryUI\jquery-ui-1.8.16.custom.css" /> <Content Include="Content\jQueryUI\jquery-ui-1.8.16.custom.css" />
<Content Include="Content\Messages.css" /> <Content Include="Content\Messages.css" />
<Content Include="Content\Grid.css" /> <Content Include="Content\Grid.css" />
<Content Include="Content\Images\close.png" />
<Content Include="Content\Images\Downloading.png" />
<Content Include="Content\Images\error.png" /> <Content Include="Content\Images\error.png" />
<Content Include="Content\Images\Failed.png" />
<Content Include="Content\Images\gritter.png" /> <Content Include="Content\Images\gritter.png" />
<Content Include="Content\Images\Missing.png" />
<Content Include="Content\Images\NotAired.png" />
<Content Include="Content\Images\Ready.png" />
<Content Include="Content\Images\Rename.png" />
<Content Include="Content\Images\Search.png" />
<Content Include="Content\Images\success.png" /> <Content Include="Content\Images\success.png" />
<Content Include="Content\Images\Unpacking.png" />
<Content Include="Content\jquery.gritter.css" /> <Content Include="Content\jquery.gritter.css" />
<Content Include="Content\Menu.css" /> <Content Include="Content\Menu.css" />
<Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs"> <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
@ -288,10 +269,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Content\ActionButton.css" /> <Content Include="Content\ActionButton.css" />
<Content Include="Content\Images\ignored.png" />
<Content Include="Content\Images\ignoredNeutral.png" />
<Content Include="Content\Images\notIgnored.png" />
<Content Include="Content\Images\x_16.png" />
<Content Include="Content\QualitySettings.css" /> <Content Include="Content\QualitySettings.css" />
<Content Include="Content\Overrides.css" /> <Content Include="Content\Overrides.css" />
<Content Include="Content\Images\ajax-loader.gif" /> <Content Include="Content\Images\ajax-loader.gif" />
@ -300,11 +277,8 @@
<Content Include="Content\Images\Indexers\NzbMatrix.png" /> <Content Include="Content\Images\Indexers\NzbMatrix.png" />
<Content Include="Content\Images\Indexers\NzbsRus.png" /> <Content Include="Content\Images\Indexers\NzbsRus.png" />
<Content Include="Content\Images\Indexers\Unknown.png" /> <Content Include="Content\Images\Indexers\Unknown.png" />
<Content Include="Content\Images\Plus.png" />
<Content Include="Content\Images\VideoFolder.png" />
<Content Include="Content\Settings.css" /> <Content Include="Content\Settings.css" />
<Content Include="Content\NzbDrone.css" /> <Content Include="Content\NzbDrone.css" />
<Content Include="Content\Images\XbmcNotification.png" />
<Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" /> <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
<Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" /> <Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
<Content Include="Content\themes\base\images\ui-bg_glass_55_fbf9ee_1x400.png" /> <Content Include="Content\themes\base\images\ui-bg_glass_55_fbf9ee_1x400.png" />

View File

@ -16,7 +16,7 @@
$.gritter.add({ $.gritter.add({
title: data.Title, title: data.Title,
text: data.Text, text: data.Text,
image: '../../content/images/success.png', icon: 'icon-info-sign',
class_name: 'gritter-success' class_name: 'gritter-success'
}); });
} }
@ -24,7 +24,7 @@
$.gritter.add({ $.gritter.add({
title: data.Title, title: data.Title,
text: data.Text, text: data.Text,
image: '../../content/images/error.png', icon: 'icon-minus-sign',
class_name: 'gritter-fail', class_name: 'gritter-fail',
time: 10000 time: 10000
}); });
@ -40,7 +40,7 @@
$.gritter.add({ $.gritter.add({
title: 'Request failed', title: 'Request failed',
text: 'Url: ' + this.url + '<br/>Error: ' + thrownError, text: 'Url: ' + this.url + '<br/>Error: ' + thrownError,
image: '../../content/images/error.png', icon: 'icon-minus-sign',
class_name: 'gritter-fail', class_name: 'gritter-fail',
time: 10000 time: 10000
}); });

View File

@ -33,7 +33,7 @@ $(".addExistingButton").live('click', function () {
$.gritter.add({ $.gritter.add({
title: 'Failed', title: 'Failed',
text: 'Invalid Series Information for \'' + path + '\'', text: 'Invalid Series Information for \'' + path + '\'',
image: '../../content/images/error.png', icon: 'icon-minus-sign',
class_name: 'gritter-fail' class_name: 'gritter-fail'
}); });
@ -76,8 +76,8 @@ $(".start-date-master").live('change', function () {
//RootDir //RootDir
//Delete RootDir //Delete RootDir
$('#rootDirs .actionButton img').live('click', function (image) { $(document).on('click', '.delete-root', function () {
var path = $(image.target).attr('id'); var path = $(this).attr('data-path');
$.ajax({ $.ajax({
type: "POST", type: "POST",

View File

@ -103,6 +103,7 @@
var user = params.title, var user = params.title,
text = params.text, text = params.text,
image = params.image || '', image = params.image || '',
icon = params.icon || '',
sticky = params.sticky || false, sticky = params.sticky || false,
item_class = params.class_name || '', item_class = params.class_name || '',
position = $.gritter.options.position, position = $.gritter.options.position,
@ -127,13 +128,22 @@
this._custom_timer = time_alive; this._custom_timer = time_alive;
} }
var image_str = (image != '') ? '<img src="' + image + '" class="gritter-image" />' : '', var image_str = (image != '') ? '<img src="' + image + '" class="gritter-image" />' : '';
class_name = (image != '') ? 'gritter-with-image' : 'gritter-without-image'; var icon_str = (icon != '') ? '<i class="' + icon + ' gritter-icon"></i>' : '';
var class_name = (image != ''|| icon != '') ? 'gritter-with-image' : 'gritter-without-image';
var iconImage = '';
if (image_str != '')
iconImage = image_str;
if (icon_str != '')
iconImage = icon_str;
// String replacements on the template // String replacements on the template
tmp = this._str_replace( tmp = this._str_replace(
['[[username]]', '[[text]]', '[[close]]', '[[image]]', '[[number]]', '[[class_name]]', '[[item_class]]'], ['[[username]]', '[[text]]', '[[close]]', '[[image]]', '[[number]]', '[[class_name]]', '[[item_class]]'],
[user, text, this._tpl_close, image_str, this._item_count, class_name, item_class], tmp [user, text, this._tpl_close, iconImage, this._item_count, class_name, item_class], tmp
); );
this['_before_open_' + number](); this['_before_open_' + number]();

View File

@ -8,7 +8,7 @@
@foreach (var root in Model) @foreach (var root in Model)
{ {
<div class="actionButton delete"> <div class="actionButton delete">
<img src="../../Content/Images/x_16.png" alt="delete" id='@root'/> <i class="icon-remove icon-large delete-root" data-path="@root"></i>
<span>@root</span> <span>@root</span>
</div> </div>
} }

View File

@ -95,7 +95,7 @@
}, //Date }, //Date
{ sName: 'Actions', sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "bSearchable": false, "fnRender": function (row) { { sName: 'Actions', sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "bSearchable": false, "fnRender": function (row) {
var deleteImage = '<i class="icon-remove gridAction" title="Delete from History" onclick="deleteHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ')"></i>'; var deleteImage = '<i class="icon-remove gridAction" title="Delete from History" onclick="deleteHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ')"></i>';
var redownloadImage = '<i class="icon-share-alt gridAction" title="Redownload Episode" onclick="redownloadHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ', ' + row.aData["EpisodeId"] + ')"></i>'; var redownloadImage = '<i class="icon-repeat gridAction" title="Redownload Episode" onclick="redownloadHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ', ' + row.aData["EpisodeId"] + ')"></i>';
return deleteImage + redownloadImage; return deleteImage + redownloadImage;
} }