removed back buttons again and replaced them by grade - subject navigation bar. moved profile/stuff/about icons into the top bar on stages 2 and 3

4 files changed, 21 insertions, 14 deletions

diff --git a/chakra/css/chakra.css b/chakra/css/chakra.css
index 56299f0..b9173a1 100755
--- a/chakra/css/chakra.css
+++ b/chakra/css/chakra.css
@@ -17,6 +17,11 @@ border: none;
 height: 30px;
 }
 
+#nav_right
+{
+float: right;
+}
+
 #month
 {
 vertical-align: middle;
diff --git a/chakra/grade1.html b/chakra/grade1.html
index af14f0a..261ff57 100755
--- a/chakra/grade1.html
+++ b/chakra/grade1.html
@@ -20,7 +20,13 @@
 
 <div id="mainmenu">
 <div id="navigation">
-<a href="index.html"><img src="testdata/chakra_logo.png" alt="Home" title="Home"></a> <a href="index.html"><img src="testdata/back.png" alt="Back" title="Back"></a> <img align="right" src="testdata/help.png" alt="Help" title="Help">
+<a href="index.html"><img src="testdata/chakra_logo.png" alt="Chakra icon" title="Chakra"></a>
+<img src="testdata/grade1.png" alt="Grade 1 icon">
+
+<img id="nav_right" src="testdata/help.png" alt="Help" title="Help">
+<img id="nav_right" src="testdata/about.png" alt="Karma icon" title="About Karma">
+<img id="nav_right" src="testdata/mystuff.png" alt="Stuff icon" title="My stuff">
+<img id="nav_right" src="testdata/profile.png" alt="Profile icon" title="My profile">
 </div>
 <ul id="grades" class="usual">
 <li id="grade1"><a href="grade1e.html"><img src="testdata/01_10.png" width="100px" alt="English" title="English">English</a></li>
@@ -34,11 +40,6 @@
 <li id="grade7"><a href="#tab_grade7"><img src="testdata/01_16.png" width="100px" alt="History" title="History">History</a></li>
 <li id="grade8"><a href="#tab_grade8"><img src="testdata/01_17.png" width="100px" alt="Health" title="Health">Health</a></li>
 </ul>
-<ul id="admin" class="usual">
-<li id="profile"><a href="#tab_profile"><img src="testdata/profile.png" alt="Student Profile" title="profile"><br />Student Profile</a></li>
-<li id="mystuff"><a href="#tab_mystuff"><img src="testdata/mystuff.png" alt="My Stuff" title="mystuff"><br />My Stuff</a></li>
-<li id="about"><a href="#tab_about"><img src="testdata/about.png" width="80px" alt="About Karma" title="about"><br />About Karma</a></li>
-</ul>
 </div>
 
 </body>
diff --git a/chakra/grade1e.html b/chakra/grade1e.html
index 9a59b62..d237779 100755
--- a/chakra/grade1e.html
+++ b/chakra/grade1e.html
@@ -20,7 +20,14 @@
 
 <div id="mainmenu">
 <div id="navigation">
-<a href="index.html"><img src="testdata/chakra_logo.png" alt="Home" title="Home"></a> <a href="grade1.html"><img src="testdata/back.png" alt="Back" title="Back"></a> <img align="right" src="testdata/help.png" alt="Help" title="Help">
+<a href="index.html"><img src="testdata/chakra_logo.png" alt="Chakra icon" title="Chakra"></a>
+<a href="grade1.html"><img src="testdata/grade1.png" alt="Grade 1" title="Grade 1"></a>
+<img src="testdata/01_10.png" alt="English icon">
+
+<img id="nav_right" src="testdata/help.png" alt="Help" title="Help">
+<img id="nav_right" src="testdata/about.png" alt="Karma icon" title="About Karma">
+<img id="nav_right" src="testdata/mystuff.png" alt="Stuff icon" title="My stuff">
+<img id="nav_right" src="testdata/profile.png" alt="Profile icon" title="My profile">
 </div>
 <div id="month_select">
 <ul id="month" class="usual">
@@ -66,12 +73,6 @@
 <div id="december">December</div>
 </div>
 
-
-<ul id="admin" class="usual">
-<li id="profile"><a href="#tab_profile"><img src="testdata/profile.png" alt="Student Profile" title="profile"><br />Student Profile</a></li>
-<li id="mystuff"><a href="#tab_mystuff"><img src="testdata/mystuff.png" alt="My Stuff" title="mystuff"><br />My Stuff</a></li>
-<li id="about"><a href="#tab_about"><img src="testdata/about.png" width="80px" alt="About Karma" title="about"><br />About Karma</a></li>
-</ul>
 </div>
 
 <script type="text/javascript"> 
diff --git a/chakra/index.html b/chakra/index.html
index 2afc9ab..9296785 100755
--- a/chakra/index.html
+++ b/chakra/index.html
@@ -20,7 +20,7 @@
 
 <div id="mainmenu">
 <div id="navigation">
-<img src="testdata/chakra_logo.png" alt="Home" title="Home"> <img src="testdata/back_bw.png" alt="Back"> <img align="right" src="testdata/help.png" alt="Help" title="Help">
+<img src="testdata/chakra_logo.png" alt="Home" title="Home"> <img id="nav_right" src="testdata/help.png" alt="Help" title="Help">
 </div>
 <ul id="grades" class="usual">
 <li id="grade1"><a href="grade1.html"><img src="testdata/grade1.png" alt="Grade 1" title="grade1">Grade 1</a></li>