projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b610662)
Absolute file paths
authorDarren <darren@darrenwhitlen.com>
Thu, 11 Oct 2012 18:04:03 +0000 (19:04 +0100)
committerDarren <darren@darrenwhitlen.com>
Thu, 11 Oct 2012 18:04:03 +0000 (19:04 +0100)
client/css/style.css patch | blob | blame | history
client/dev/view.js patch | blob | blame | history
client/index.html patch | blob | blame | history

diff --git a/client/css/style.css b/client/css/style.css
index 73ae0faf9e901ba05854e5885daa40a591148924..3f032076fdef390658bb9e4fa470cf21c1f39979 100644 (file)
--- 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 735a4c6776e8ca6fd2316c4063a955d999f24bc0..5b37ebdcbe13a0c3554c3de7dac6eff8cd7acbdf 100644 (file)
--- 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({\r
     events: {\r
         'click li': 'tabClick',\r
-        'click li img': 'partClick'\r
+        'click li .part': 'partClick'\r
     },\r
 \r
     initialize: function () {\r
@@ -516,7 +516,7 @@ kiwi.view.Tabs = Backbone.View.extend({
 \r
     panelActive: function (panel) {\r
         // Remove any existing tabs or part images\r
-        $('img', this.$el).remove();\r
+        $('.part', this.$el).remove();\r
         this.tabs_applets.children().removeClass('active');\r
         this.tabs_msg.children().removeClass('active');\r
 \r
@@ -524,7 +524,7 @@ kiwi.view.Tabs = Backbone.View.extend({
 \r
         // Only show the part image on non-server tabs\r
         if (!panel.isServer()) {\r
-            panel.tab.append('<img src="img/redcross.png" />');\r
+            panel.tab.append('<span class="part"></span>');\r
         }\r
     },\r
 \r
diff --git a/client/index.html b/client/index.html
index f63c7937545643e0a8b6c0c23b5f5e5cd98707e0..a4884c2c7ec71e11dab92d2dbf905d21373f1b0c 100644 (file)
--- a/client/index.html
+++ b/client/index.html
@@ -2,18 +2,18 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
-<base href="/" target="_blank">
+<base target="_blank">
 
 <title> KiwiIRC </title>
 
-<link rel="stylesheet" type="text/css" href="css/style.css" />
+<link rel="stylesheet" type="text/css" href="/css/style.css" />
 
 </head>
 <body>
     <div id="kiwi">
         <div id="toolbar">
             <a class="kiwi_logo" href="http://www.kiwiirc.com/" target="_blank">
-                <h2><img src="img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /> Powered by Kiwi IRC</h2>
+                <h2><img src="/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /> Powered by Kiwi IRC</h2>
             </a>
 
             <div id="tabs">
@@ -92,7 +92,7 @@
 
             <div style="position:relative;float:left;width:320px;margin-left:3em;color:#555555;">
                 <a class="kiwi_logo" href="http://www.kiwiirc.com/" target="_blank">
-                    <img src="img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /> <br />
+                    <img src="/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /> <br />
                     <h1>Powered by Kiwi IRC</h1>
                 </a>
 
@@ -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');
         }