]> git.sur5r.net Git - bacula/bacula/commitdiff
projects / bacula / bacula / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 547615c)
ebl add favicon.ico
authorEric Bollengier <eric@eb.homelinux.org>
Wed, 23 Aug 2006 19:05:59 +0000 (19:05 +0000)
committerEric Bollengier <eric@eb.homelinux.org>
Wed, 23 Aug 2006 19:05:59 +0000 (19:05 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3350 91ce42f0-d328-0410-95d8-f526ca767f89

gui/bacula-gui.spec.in patch | blob | history
gui/bweb/INSTALL patch | blob | history
gui/bweb/ReleaseNotes patch | blob | history
gui/bweb/html/bweb.css patch | blob | history
gui/bweb/html/favicon.ico [new file with mode: 0644] patch | blob
gui/bweb/tpl/begin.tpl patch | blob | history

diff --git a/gui/bacula-gui.spec.in b/gui/bacula-gui.spec.in
index 6706cd39ff356493bdd24b65016a8db31449cbb7..4d8c9be1f9ca5e65319e216dc06c6e03a1015478 100644 (file)
--- a/gui/bacula-gui.spec.in
+++ b/gui/bacula-gui.spec.in
@@ -232,6 +232,7 @@ cp -p %{bweb}-%{version}/html/*.js $RPM_BUILD_ROOT%{docdir}/%{bweb}/
 cp -p %{bweb}-%{version}/html/*.png $RPM_BUILD_ROOT%{docdir}/%{bweb}/
 cp -p %{bweb}-%{version}/html/*.css $RPM_BUILD_ROOT%{docdir}/%{bweb}/
 cp -p %{bweb}-%{version}/html/*.gif $RPM_BUILD_ROOT%{docdir}/%{bweb}/
+cp -p %{bweb}-%{version}/html/*.ico $RPM_BUILD_ROOT%{docdir}/%{bweb}/
 chmod 644 $RPM_BUILD_ROOT%{docdir}/%{bweb}/*
 
 
diff --git a/gui/bweb/INSTALL b/gui/bweb/INSTALL
index 3d8687941a3b7777c4265be867e63e4aa24b8060..92129949ff4849a1e291b283aaaf957847981265 100644 (file)
--- a/gui/bweb/INSTALL
+++ b/gui/bweb/INSTALL
@@ -34,7 +34,7 @@ Bweb works well with 1.39 release.
 
  # copy bweb graphics elements (bweb elements must reside on /bweb)
  mkdir /var/www/bweb
- install -m 644 -o root -g root  bweb/html/*.{js,png,css,gif} /var/www/bweb
+ install -m 644 -o root -g root  bweb/html/*.{js,png,css,gif,ico} /var/www/bweb
 
  # done !
 
diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index b857734803a9da1dfdec97e7124f66f457d3872b..4cf6e25ca394f8226096ebe04007f63f57178f42 100644 (file)
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -6,6 +6,7 @@
  - Add menubar instead of plain menu
  - Drop all <button> element (work now with IE)
  - Fix big div
+ - Add favicon
 
 2006/08/22:
  - Add autochanger module (add/del/mod)
diff --git a/gui/bweb/html/bweb.css b/gui/bweb/html/bweb.css
index 5323cfdc126036a842355933e68124db083027e1..722fbccd1238c6313169b416bb67dd35ee5e8200 100644 (file)
--- a/gui/bweb/html/bweb.css
+++ b/gui/bweb/html/bweb.css
@@ -45,8 +45,8 @@ td.joberr { background-color: red; color: white;}
 
 input.button {
   border: 0px;
-  margin-right: 5px;
-  margin-left: 5px;
+  margin: 0 5px 0 5px;
+  padding: 0 0 0 0;
 }
 
 #menu, #menu ul {
@@ -59,6 +59,7 @@ input.button {
        border: solid #999;
        border-width: 1px 0;
        margin: 0 0 1em 0;
+       padding: 0.25em 2em;
         width: 100%;
        color: #7C6240;
 }
@@ -77,17 +78,14 @@ input.button {
 #menu li {
        float: left;
        padding: 0;
-       width: 10em;
 }
 
 #menu li ul {
        position: absolute;
        left: -999em;
        height: auto;
-       width: 14.4em;
-       font-weight: normal;
+       width: 12.4em;
        border-width: 1px;
-       margin: 0;
 }
 
 #logged {
@@ -100,11 +98,9 @@ input.button {
 
 #menu li li {
        padding-right: 1em;
-       width: 13em
 }
 
 #menu li ul a {
-       width: 13em;
 }
 
 #menu li ul ul {
diff --git a/gui/bweb/html/favicon.ico b/gui/bweb/html/favicon.ico
new file mode 100644 (file)
index 0000000..d4ead7a
Binary files /dev/null and b/gui/bweb/html/favicon.ico differ
diff --git a/gui/bweb/tpl/begin.tpl b/gui/bweb/tpl/begin.tpl
index 630c9f4298a03896b3405c9cff55cfb09f3ab0ce..3c85f97f90a6cee1dea84e5280e858cc448fa4b1 100644 (file)
--- a/gui/bweb/tpl/begin.tpl
+++ b/gui/bweb/tpl/begin.tpl
@@ -2,6 +2,7 @@
 <html>
 <head>
 <title>Bweb - Bacula Web Interface</title>
+<link rel="SHORTCUT ICON" href="/bweb/favicon.ico">
 <script type="text/javascript" language="JavaScript" src="/bweb/natcompare.js"></script>
 <script type="text/javascript" language="JavaScript" src="/bweb/nrs_table.js"></script>
 <script type="text/javascript" language="JavaScript" src="/bweb/bweb.js"></script>
@@ -32,8 +33,7 @@ if (navigator.appName == 'Konqueror') {
   <ul>
      <li><a href="?action=pool">Pools</a> </li>
      <li><a href="?action=location">Locations</a> </li>
-     <li><a href="?action=media">All Medias</a> </li>
-     <li><hr></li>
+     <li><a href="?action=media">All Medias</a><hr></li>
      <li><a href="?action=extern_media">Eject Medias</a> </li>
      <li><a href="?action=intern_media">Load Medias</a> </li>
   </ul>
@@ -51,8 +51,8 @@ if (navigator.appName == 'Konqueror') {
  <li> <a href="?action=view_conf"> Configuration </a> </li>
  <li> <a href="?action=about"> About </a> </li>
  <li style="padding: 0.25em 2em;float: right;">&nbsp;Logged as <TMPL_VAR NAME=loginname> </li>
- <li style="float: right;padding-right: 1em;white-space: nowrap;">
-<input type="image" class="button" title="search media" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="search client" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="search media or client"></li>
+ <li style="float: right;white-space: nowrap;">
+<input type="image" class="button" title="search media" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="search client" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="search media or client"></li>
 </ul>
 
 <form name="search" action="?" method='GET'>
Cloned from http://git.bacula.org/bacula