From 41e836ee1bbfeb6aeeef204df8179a1af5d455c2 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 11 Oct 2012 19:04:03 +0100 Subject: [PATCH] Absolute file paths --- client/css/style.css | 3 ++- client/dev/view.js | 6 +++--- client/index.html | 44 ++++++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/client/css/style.css b/client/css/style.css index 73ae0fa..3f03207 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -75,6 +75,7 @@ a img { border:none; } rgb(209,209,209) 68% ); } + #toolbar .panellist .active { padding-right:23px; } #toolbar .panellist .alert_highlight { background: #990000; @@ -83,7 +84,7 @@ a img { border:none; } #toolbar .panellist .alert_activity { font-weight: bold; background: #009900; } #toolbar .panellist .alert_action { font-weight: bold; } -#toolbar .panellist li img { width:1em; height:1em; top:7px; right:5px; position:absolute; } +#toolbar .panellist li .part { top:8px; right:5px; position:absolute; background:url('../img/redcross.png'); width:14px; height:14px; } #toolbar .panellist li img.icon { left:5px; top:2px; height:auto; width:auto; } #toolbar .panellist li.server span { background:url(../img/server_tab.png) no-repeat; padding-left:23px; } diff --git a/client/dev/view.js b/client/dev/view.js index 735a4c6..5b37ebd 100644 --- a/client/dev/view.js +++ b/client/dev/view.js @@ -449,7 +449,7 @@ kiwi.view.Channel = kiwi.view.Panel.extend({ kiwi.view.Tabs = Backbone.View.extend({ events: { 'click li': 'tabClick', - 'click li img': 'partClick' + 'click li .part': 'partClick' }, initialize: function () { @@ -516,7 +516,7 @@ kiwi.view.Tabs = Backbone.View.extend({ panelActive: function (panel) { // Remove any existing tabs or part images - $('img', this.$el).remove(); + $('.part', this.$el).remove(); this.tabs_applets.children().removeClass('active'); this.tabs_msg.children().removeClass('active'); @@ -524,7 +524,7 @@ kiwi.view.Tabs = Backbone.View.extend({ // Only show the part image on non-server tabs if (!panel.isServer()) { - panel.tab.append(''); + panel.tab.append(''); } }, diff --git a/client/index.html b/client/index.html index f63c793..a4884c2 100644 --- a/client/index.html +++ b/client/index.html @@ -2,18 +2,18 @@ - + KiwiIRC - +
@@ -92,7 +92,7 @@
@@ -154,45 +154,45 @@ // Common dependancies that are required at all times var scripts = [ - ['jquery-1.7.1.min.js', 'underscore-min.js'], - 'backbone-git.js' + ['/jquery-1.7.1.min.js', '/underscore-min.js'], + '/backbone-git.js' ]; // If in debug mode, load each development script if (getQueryVariable('debug')) { console.log('Loading debugging scripts'); scripts = scripts.concat([ - 'dev/app.js', + '/dev/app.js', [ - 'dev/model_application.js', - 'dev/model_gateway.js' + '/dev/model_application.js', + '/dev/model_gateway.js' ], [ - 'dev/model_panellist.js', - 'dev/model_panel.js', - 'dev/model_member.js', - 'dev/model_memberlist.js' + '/dev/model_panellist.js', + '/dev/model_panel.js', + '/dev/model_member.js', + '/dev/model_memberlist.js' ], [ - 'dev/model_channel.js', - 'dev/model_server.js', - 'dev/model_applet.js' + '/dev/model_channel.js', + '/dev/model_server.js', + '/dev/model_applet.js' ], [ - 'dev/applet_settings.js', - 'dev/applet_nickserv.js', - 'dev/applet_chanlist.js' + '/dev/applet_settings.js', + '/dev/applet_nickserv.js', + '/dev/applet_chanlist.js' ], [ - 'dev/utils.js', - 'dev/view.js' + '/dev/utils.js', + '/dev/view.js' ] ]); } else { - scripts.push('kiwi.js'); + scripts.push('/kiwi.js'); } -- 2.25.1