Add icon images to theme

8 files changed, 39 insertions, 5 deletions

diff --git a/.gitattributes b/.gitattributes
index fdb58b53..2d8f049d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1155,10 +1155,15 @@ demos/time-tracker/tests/unit/TimeEntryDaoTestCase.php -text
 demos/time-tracker/tests/unit/UserDaoTestCase.php -text
 demos/time-tracker/themes/TimeTracker/background.png -text
 demos/time-tracker/themes/TimeTracker/bar.png -text
+demos/time-tracker/themes/TimeTracker/bell.gif -text
+demos/time-tracker/themes/TimeTracker/group.gif -text
 demos/time-tracker/themes/TimeTracker/project.css -text
+demos/time-tracker/themes/TimeTracker/report.gif -text
 demos/time-tracker/themes/TimeTracker/site.css -text
+demos/time-tracker/themes/TimeTracker/sync.gif -text
 demos/time-tracker/themes/TimeTracker/tabs.png -text
 demos/time-tracker/themes/TimeTracker/time-entry.css -text
+demos/time-tracker/themes/TimeTracker/time.gif -text
 docs/application.xml -text
 docs/specs/application.dtd -text
 docs/specs/application.xsd -text
diff --git a/demos/time-tracker/protected/pages/TimeTracker/SiteMap.tpl b/demos/time-tracker/protected/pages/TimeTracker/SiteMap.tpl
index 0d79c1e2..8eff7572 100644
--- a/demos/time-tracker/protected/pages/TimeTracker/SiteMap.tpl
+++ b/demos/time-tracker/protected/pages/TimeTracker/SiteMap.tpl
@@ -1,18 +1,24 @@
 <com:TPanel CssClass="sitemap" Visible="true">

 <ul class="level1">

 	<li class="<com:TPlaceHolder ID="LogMenu" />">

-		<a class="menuitem" href="?page=TimeTracker.LogTimeEntry">Log</a>

+		<a class="menuitem" href="?page=TimeTracker.LogTimeEntry">

+		<img src="<%= $this->Page->Theme->BaseUrl %>/time.gif" width="16" height="16" alt="">

+		<span>Log</span></a>

 	</li>

 	<com:TPlaceHolder Visible=<%= $this->User->isInRole('manager') %> >

 	<li class="<com:TPlaceHolder ID="ReportMenu" />">

-		<a class="menuitem" href="?page=TimeTracker.ReportProject">Reports</a>

+		<a class="menuitem" href="?page=TimeTracker.ReportProject">

+		<img src="<%= $this->Page->Theme->BaseUrl %>/report.gif" width="16" height="16" alt="">

+		<span>Reports</span></a>

 		<ul class="level2">

 			<li><a href="?page=TimeTracker.ReportProject">Project Reports</a></li>

 			<li><a href="?page=TimeTracker.ReportResource">Resources Report</a></li>

 		</ul>

 	</li>

 	<li class="<com:TPlaceHolder ID="ProjectMenu" />">

-		<a class="menuitem" href="?page=TimeTracker.ProjectList">Projects</a>

+		<a class="menuitem" href="?page=TimeTracker.ProjectList">

+		<img src="<%= $this->Page->Theme->BaseUrl %>/bell.gif" width="16" height="16" alt="">

+		<span>Projects</span></a>

 		<ul class="level2">

 			<li><a href="?page=TimeTracker.ProjectDetails">Create New Project</a></li>

 			<li><a href="?page=TimeTracker.ProjectList">List Projects</a></li>

@@ -21,7 +27,9 @@
 	</com:TPlaceHolder>

 	<com:TPlaceHolder Visible=<%= $this->User->isInRole('admin') %> >

 	<li class="<com:TPlaceHolder ID="AdminMenu" />">

-		<a class="menuitem" href="?page=TimeTracker.UserList">Adminstration</a>

+		<a class="menuitem" href="?page=TimeTracker.UserList">

+		<img src="<%= $this->Page->Theme->BaseUrl %>/group.gif" width="16" height="16" alt="">

+		<span>Adminstration</span></a>

 		<ul class="level2">

 			<li><a href="?page=TimeTracker.UserCreate">Create New User</a></li>

 			<li><a href="?page=TimeTracker.UserList">List Users</a></li>

@@ -41,7 +49,10 @@
 				{

 					Element.removeClassName(item.parentNode, "active");

 				});

-				Element.addClassName(Event.element(ev).parentNode, "active");

+				node = Event.element(ev).parentNode;

+				if(node.tagName.toLowerCase() != 'li')

+					node = node.parentNode;

+				Element.addClassName(node, "active");

 			});

 		});

 	});

diff --git a/demos/time-tracker/themes/TimeTracker/bell.gif b/demos/time-tracker/themes/TimeTracker/bell.gif
new file mode 100644
index 00000000..ef9f7d65
--- /dev/null
+++ b/demos/time-tracker/themes/TimeTracker/bell.gif
diff --git a/demos/time-tracker/themes/TimeTracker/group.gif b/demos/time-tracker/themes/TimeTracker/group.gif
new file mode 100644
index 00000000..89c577f7
--- /dev/null
+++ b/demos/time-tracker/themes/TimeTracker/group.gif
diff --git a/demos/time-tracker/themes/TimeTracker/report.gif b/demos/time-tracker/themes/TimeTracker/report.gif
new file mode 100644
index 00000000..f7169762
--- /dev/null
+++ b/demos/time-tracker/themes/TimeTracker/report.gif
diff --git a/demos/time-tracker/themes/TimeTracker/site.css b/demos/time-tracker/themes/TimeTracker/site.css
index 8a162002..bfe59f9e 100644
--- a/demos/time-tracker/themes/TimeTracker/site.css
+++ b/demos/time-tracker/themes/TimeTracker/site.css
@@ -24,6 +24,7 @@ div.main
 	-moz-border-radius: 15px 15px 0 0;

 }

 

+

 h1.heading, h1 a

 {

 	color: white;

@@ -37,6 +38,15 @@ h1.heading, h1 a:hover
 	color: white;

 }

 

+h1.heading

+{

+	background-image: url(sync.gif);

+	background-repeat: no-repeat;

+	background-position: center left;

+	padding: 0px 0px 5px 75px;

+}

+

+

 h1 .subheading

 {

 	display: block;

@@ -117,6 +127,7 @@ ul.level1 li .menuitem
 	color: #f71;	

 	font-weight: bold;

 	letter-spacing: 2px;

+	text-decoration: none;

 }

 

 ul.level1 li.active .menuitem

@@ -125,6 +136,13 @@ ul.level1 li.active .menuitem
 	background-image: none;

 }

 

+ul.level1 li .menuitem img

+{

+	border: 0 none;

+	vertical-align: middle;

+	margin-top: -4px;

+}

+

 ul.level2

 {

 	display: none;

diff --git a/demos/time-tracker/themes/TimeTracker/sync.gif b/demos/time-tracker/themes/TimeTracker/sync.gif
new file mode 100644
index 00000000..3ed6630f
--- /dev/null
+++ b/demos/time-tracker/themes/TimeTracker/sync.gif
diff --git a/demos/time-tracker/themes/TimeTracker/time.gif b/demos/time-tracker/themes/TimeTracker/time.gif
new file mode 100644
index 00000000..c0c9ce09
--- /dev/null
+++ b/demos/time-tracker/themes/TimeTracker/time.gif