← Back to branch summary

~zalongwa/ihris-manage-ztl/4.1

« back to all changes in this revision

Viewing changes to templates/en_US/main.html

  • Committer: Sophia Rogati
  • Date: 2013-09-05 12:22:51 UTC
  • Revision ID: sophia.rogati@zalongwa.com-20130905122251-9p3wq1qwbpbgqg0b
Modifying Personal information and demographic information

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/en_US/main.html
3
3
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4
4
<html>
5
5
<head>
 
6
<<<<<<< TREE
 
7
<title>iHRIS Manage Zalongwa</title>
 
8
=======
6
9
<title>iHRIS Manage-Zalongwa</title>
 
10
>>>>>>> MERGE-SOURCE
7
11
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
8
12
<meta http-equiv="content-language" content="en-us" />
9
13
<meta name="robots" content="all" />
13
17
<meta name="copyright" content="" />
14
18
<meta name="Description" content="" />
15
19
<meta name="Keywords" content="Juma Lungo, UDSM, University of Dar-es-Salaam, Tanzania, Zalongwa, Malawi" />
16
 
<link rel="Shortcut Icon" href="file/favicon.ico">
 
20
<link rel="Shortcut Icon" href="file/zal.ico">
17
21
<link rel="stylesheet" href="file/container-print.css" type="text/css" media="print" />
18
22
<link rel="stylesheet" href="file/container-screen.css" type="text/css" media="screen" />
19
23
<style type="text/css" media="screen">
27
31
<div id="siteHeadWrap"><!-- ie6 redundant tag fix -->
28
32
<div id="siteHeader">
29
33
 
 
34
<<<<<<< TREE
 
35
<a name="top"><img src="file/zalongwa.png" alt="" width="62" height="62" id="siteLogo" /></a>
 
36
<!--<a name="top"><img src="file/mwflag.jpeg" alt="" width="68" height="45" id="siteFlag" /></a>-->
 
37
<p id="siteName">Zalongwa Technologies Limited</p>
 
38
<p id="siteTag">Human Resource for Health Information System</p>
 
39
=======
30
40
<!--<a name="top"><img src="file/photos/zalongwalogo1.jpg" alt="" width="200" height="62" id="siteLogo" /></a>-->
31
41
<!--<a name="top"><img src="file/mwflag.jpeg" alt="" width="68" height="45" id="siteFlag" /></a>-->
32
42
<p id="siteName">Zalongwa Technologies Limited</p>
33
43
<p id="siteTag">Human Resource Information System</p>
 
44
>>>>>>> MERGE-SOURCE
34
45
 
35
46
<div id="inlineNavWrap"><!-- ie6 redundant tag fix -->
36
47
<div id="inlineNavBar">
70
81
</div><!-- /siteInnerWrap -->
71
82
 
72
83
<div id="siteFooter">
 
84
<<<<<<< TREE
 
85
<div align="center">Copyright &copy; Zalongwa Technologies Ltd </div>
 
86
=======
73
87
<div align="center">Copyright &copy; Zalongwa Technologies Limited </div>
 
88
>>>>>>> MERGE-SOURCE
74
89
<div align="center">iHRIS Version: <span type='module' call="ihris-common->showModuleVersion('ihris-manage')"/></div>
75
90
<span type='module' call='localeSelector->showSelectableLocales()'></span>
76
91
</div><!-- /siteFooter -->