From 74cb0b8694925f3d07f77c367d7e5397b4428720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Tue, 8 May 2012 12:30:18 +0200
Subject: [PATCH] Bug #1284: Added favicon.

FEA: ItEr76S04BugFixing
---
 .../src/main/webapp/common/img/favicon.ico      | Bin 0 -> 16958 bytes
 .../src/main/webapp/common/layout/login.zul     |   1 +
 .../src/main/webapp/planner/index.zul           |   1 +
 3 files changed, 2 insertions(+)
 create mode 100644 libreplan-webapp/src/main/webapp/common/img/favicon.ico

diff --git a/libreplan-webapp/src/main/webapp/common/img/favicon.ico b/libreplan-webapp/src/main/webapp/common/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..ef5fbd340c9499f9e5ca755688fc207633f8cd6b
GIT binary patch
literal 16958
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
B*7pDa

literal 0
HcmV?d00001

diff --git a/libreplan-webapp/src/main/webapp/common/layout/login.zul b/libreplan-webapp/src/main/webapp/common/layout/login.zul
index d0a4f0855..809c1a0b4 100644
--- a/libreplan-webapp/src/main/webapp/common/layout/login.zul
+++ b/libreplan-webapp/src/main/webapp/common/layout/login.zul
@@ -20,6 +20,7 @@
 -->
 <?page title="${i18n:_('LibrePlan: User access')}" ?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
+<?link rel="shortcut icon" href="/common/img/favicon.ico" type="image/x-icon"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/login.css"?>
 
 <?xel-method prefix="project" name="version" class="org.libreplan.business.common.VersionInformation"
diff --git a/libreplan-webapp/src/main/webapp/planner/index.zul b/libreplan-webapp/src/main/webapp/planner/index.zul
index 5fbc53d8a..817026d99 100644
--- a/libreplan-webapp/src/main/webapp/planner/index.zul
+++ b/libreplan-webapp/src/main/webapp/planner/index.zul
@@ -23,6 +23,7 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
+<?link rel="shortcut icon" href="/common/img/favicon.ico" type="image/x-icon"?>
 <?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>