styyle and layout adjustsments

diff --git a/docs/themes/default/forms.css b/docs/themes/default/forms.css
index 44129a5..7a57ae0 100644 (file)
--- a/docs/themes/default/forms.css
+++ b/docs/themes/default/forms.css
@@ -36,7 +36,7 @@ div.input-form {
        border: thin #cccccc solid;
        margin-bottom: 20px;
        line-height:150%;
-       background-color: #F8F8F8;
+       background-color: #FFF5EE;
 border-radius:.5em .5em .5em .5em;
 -moz-border-radius:.5em .5em .5em .5em;
        -moz-box-shadow:.05em .05em .0em #999999;
@@ -44,7 +44,7 @@ border-radius:.5em .5em .5em .5em;
 }
 
 div.input-form div.row {
-       background-color: #F8F8F8;
+       background-color:  #FFF5EE;
        padding:8px;
 }
 

diff --git a/docs/themes/default/include/header.tmpl.php b/docs/themes/default/include/header.tmpl.php
index de0631f..a4cecd4 100644 (file)
--- a/docs/themes/default/include/header.tmpl.php
+++ b/docs/themes/default/include/header.tmpl.php
@@ -52,7 +52,6 @@ if (!defined('TR_INCLUDE_PATH')) { exit; }
  * ======================================
  * back_to_page              array('url', 'title')            the link back to the part of the current page, if needed.
  */
-
 include_once(TR_INCLUDE_PATH.'classes/Utility.class.php');
 $lang_charset = "UTF-8";
 //Timer
@@ -73,6 +72,23 @@ $starttime = $mtime;
        <meta name="keywords" content="AContent, free, open source, elearning, authoring, common cartridge, content package, QTI, AccessForAll, AFA, repository" />
        <meta name="description" content="AContent is a standards compliant Web-based elearning content authoring tool and repository that can be used with any sysem that supports IMS content interoperability standards." />
        <base href="<?php echo $this->content_base_href; ?>" />
+       
+           <script type="text/javascript">
+      WebFontConfig = {
+        google: { families: [ 'Droid Sans', 'Cantarell' ] }
+      };
+      (function() {
+        var wf = document.createElement('script');
+        wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+            '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
+        wf.type = 'text/javascript';
+        wf.async = 'true';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(wf, s);
+      })();
+    </script>
+
+       <link href='http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold' rel='stylesheet' type='text/css'>
        <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/forms.css" type="text/css" />
        <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/styles.css" type="text/css" />
        <!--[if IE]>
@@ -152,12 +168,29 @@ foreach ($this->top_level_pages as $page) {
     </ul>
   </div>
 -->
+
+
        <!-- the sub navigation and guide -->
   <div id="sub-menu">
    
       <div class="search_top">
       <form target="_top" action="<?php echo TR_BASE_HREF; ?>home/search.php" method="get">
         <input type="text" name="search_text" id="search_text_at_header" value="<?php if (isset($_GET['search_text'])) echo $_GET['search_text']; ?>" size="25" />
+      
+<?php 
+
+if (is_array($this->categories)) { // print category dropdown list box?>
+    <select name="catid">
+      <option value="" <?php if (!isset($_GET['catid']) || $_GET['catid'] == '') echo 'selected="selected"'; ?>><?php echo _AT('all_categories'); ?></option>
+      <option value="">---------------------------------</option>
+<?php foreach ($this->categories as $category) {?>
+      <option value="<?php echo $category['category_id']; ?>" <?php if ($_GET['catid'] == $category['category_id']) echo 'selected'; ?>><?php echo $category['category_name']; ?></option>
+<?php }?>
+      <option value="0" <?php if ($_GET['catid'] == 0 && $_GET['catid'] <> '') echo 'selected'; ?>><?php echo _AT('cats_uncategorized'); ?></option>
+    </select>
+<?php }?>
+        
+        
         <input type="submit" name="search" value="<?php echo _AT("search"); ?>" />
       </form>
       </div>
@@ -275,13 +308,13 @@ foreach ($this->top_level_pages as $page) {
       <div id="sequence-links">
         <?php //if ($_SESSION["prefs"]["PREF_SHOW_NEXT_PREVIOUS_BUTTONS"]) { ?>
           <?php if ($this->sequence_links['resume']): ?>
-        <a style="color:white;" href="<?php echo $this->sequence_links['resume']['url']; ?>" accesskey="."><img src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/images/resume.gif" border="0" title="<?php echo _AT('resume').': '.$this->sequence_links['resume']['title']; ?> Alt+." alt="<?php echo $this->sequence_links['resume']['title']; ?> Alt+." class="img-size-ascdesc" /></a>
+        <a style="color:white;" href="<?php echo $this->sequence_links['resume']['url']; ?>" accesskey="."><img src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/images/resume.png" border="0" title="<?php echo _AT('resume').': '.$this->sequence_links['resume']['title']; ?> Alt+." alt="<?php echo $this->sequence_links['resume']['title']; ?> Alt+." class="img-size-ascdesc" /></a>
           <?php else:
           if ($this->sequence_links['previous']): ?>
-        <a href="<?php echo $this->sequence_links['previous']['url']; ?>" title="<?php echo _AT('previous_topic').': '. $this->sequence_links['previous']['title']; ?> Alt+," accesskey=","><img src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/images/previous.gif" border="0" alt="<?php echo _AT('previous_topic').': '. $this->sequence_links['previous']['title']; ?> Alt+," class="img-size-ascdesc" /></a>
+        <a href="<?php echo $this->sequence_links['previous']['url']; ?>" title="<?php echo _AT('previous_topic').': '. $this->sequence_links['previous']['title']; ?> Alt+," accesskey=","><img src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/images/previous.png" border="0" alt="<?php echo _AT('previous_topic').': '. $this->sequence_links['previous']['title']; ?> Alt+," class="img-size-ascdesc" /></a>
           <?php endif;
           if ($this->sequence_links['next']): ?>
-        <a href="<?php echo $this->sequence_links['next']['url']; ?>" title="<?php echo _AT('next_topic').': '.$this->sequence_links['next']['title']; ?> Alt+." accesskey="."><img src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/images/next.gif" border="0" alt="<?php echo _AT('next_topic').': '.$this->sequence_links['next']['title']; ?> Alt+." class="img-size-ascdesc" /></a>
+        <a href="<?php echo $this->sequence_links['next']['url']; ?>" title="<?php echo _AT('next_topic').': '.$this->sequence_links['next']['title']; ?> Alt+." accesskey="."><img src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/images/next.png" border="0" alt="<?php echo _AT('next_topic').': '.$this->sequence_links['next']['title']; ?> Alt+." class="img-size-ascdesc" /></a>
           <?php endif; ?>
         <?php endif; ?>
                <?php // } ?>
@@ -336,7 +369,7 @@ foreach ($this->top_level_pages as $page) {
       <?php for ($i=0; $i<$num_pages; $i++): ?>
          <?php list($sub_menu_url, $param) = Utility::separateURLAndParam($this->sub_menus[$i]['url']);
       if ($sub_menu_url == $this->current_page): ?>
-       <li><strong><?php echo $this->sub_menus[$i]['title']; ?></strong></li>
+       <li class="active"><strong><?php echo $this->sub_menus[$i]['title']; ?></strong></li>
       <?php else: ?>
        <li><a href="<?php echo $this->sub_menus[$i]['url']; ?>"><?php echo $this->sub_menus[$i]['title']; ?></a></li>
       <?php endif; ?>

diff --git a/docs/themes/default/styles.css b/docs/themes/default/styles.css
index 69843b6..d8185d9 100644 (file)
--- a/docs/themes/default/styles.css
+++ b/docs/themes/default/styles.css
@@ -8,7 +8,7 @@
 /* modify it under the terms of the GNU General Public License          */
 /* as published by the Free Software Foundation.                        */
 /************************************************************************/
-
+@import url(http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold);
 
 html,body{
   height:100%;
@@ -17,7 +17,7 @@ html,body{
 
 /* main body attributes */
 body {
-  font-family: Tahoma,Geneva,sans-serif;;
+  font-family: 'Droid Sans',Tahoma,Geneva,sans-serif;;
   font-size:.9em;
   margin:0px;
   background-color:  #FFFFFF;
@@ -276,6 +276,7 @@ padding:.2em;
 div#sequence-links {
   float:right;
   padding-right: 5px;
+  padding-top:.3em;
 }
 div#sequence-links a {
   text-decoration: none;
@@ -420,41 +421,36 @@ div#breadcrumbs {
 
 h2.page-title {
   clear:right;
+  margin-left:1em;
 }
 
 h1 {
-  margin-bottom: 5px;
+       margin-bottom: 5px;
 }
 
 div#sub-menu {
-  color: #555;
-  background-color:#eeeeee; 
-  padding-top: 3px; 
-  font-size:0.85em; 
-
-    border-top:1px solid #cccccc;
-  height:2.1em;
+       color: #555;
+       background-color:#FAEBD7; 
+       padding-top: 3px; 
+       font-size:0.85em; 
+       border-top:1px solid #cccccc;
+       height:2.1em;
 }
 
 div#sub-navigation {
-  float:left;
+   float:left;
 }
 
 div#subnavlistcontainer {
        width:95%;
-       margin:auto;
        height:auto;
-       height:1.8em;
+       height:1.6em;
 
 }
 
 ul#subnavlist {
-float:left;
-       padding-top: .3em;
        margin-top: 0px;
-       margin-left:1.5em;
-font-size:.8em;
-
+       font-size:.8em;
 }
 
 ul#subnavlist li {
@@ -467,33 +463,36 @@ ul#subnavlist li {
        border-right:1px solid #cccccc;
        border-radius: .3em .3em 0em 0em;
        -moz-border-radius: .3em .3em 0em 0em;
-       height:1.0em;   
-       padding: .4em 1em .4em 1em ;
+       padding: .4em 1em .35em 1em ;
 }
 
-ul#subnavlist li a:hover, ul#subnavlist li a:focus, ul#subnavlist li.active,           ul#subnavlist li:hover{
+ul#subnavlist li a:hover, ul#subnavlist li a:focus, ul#subnavlist li:hover{
        color: black;
        text-decoration:none;
-       background-color: #E6E6E6;
+       background-color: #FFF5EE;
+       height:1.2em;
+}
+ul#subnavlist li.active{
+       padding-bottom: .5em;
+       background-color: #FFF5EE;
 }
-
 ul#subnavlist li a {
     /* The normal, unselected tabs. They are all links */
        color: #555;
-       height: 1.5em;
+       height: 1.0em;
        text-decoration:underline;
        font-weight:500;
 }
 
 div#subnavbacktopage {
        padding-top:5px;
-       padding-left:20px;
+       padding-left:5px;
        float:left;
 }
 
 
 a#guide {
-       background-image: url('images/guide.jpg'); 
+       background-image: url('images/guide.png'); 
        background-repeat: no-repeat; 
        background-position: 2px 2px;
        padding: 3px 10px 1px 25px;
@@ -503,11 +502,15 @@ a#guide {
 }
 
 div#guide_box{
+background-color:#FAEBD7;
+/*
        border-left:thin solid #cccccc;
        border-right:thin solid #cccccc;
        border-bottom:thin solid #cccccc;
+*/
        border-radius: 0em 0em .5em .5em;
        -moz-border-radius: 0em 0em .5em .5em;
+       line-height:1.5em;
        float:right;
 
        margin-right:2em;
@@ -805,10 +808,12 @@ h3.indent {
 
 h4.box {
   font-size:0.85em;
-  padding: 2px;
-  border-top: 1px solid #B8AE9C;
+  padding: 3px;
+  background-color:#FAEBD7;
+  /*border-top: 1px solid #B8AE9C;
   border-left: 1px solid #B8AE9C;
   border-right: 1px solid #B8AE9C;
+  */
   -moz-border-radius:.5em .5em 0em 0em;
   border-radius:.5em .5em 0em 0em;
 
@@ -816,11 +821,13 @@ h4.box {
 
 div.box {
   padding: 5px;
-  background-color: #F8F8F8;
+  background-color: #FAEBD7;
   color: black;
+  /*
   border-left: 1px solid #B8AE9C;
   border-right: 1px solid #B8AE9C;
   border-bottom: 1px solid #B8AE9C;
+  */
   font-size:0.8em;
   font-weight: normal;
   padding:2px;
@@ -909,20 +916,17 @@ div#menutoggle{
 }
 
 /*** header ***/
-div.topnavlistcontainer {
-  margin-right:auto;
-  margin-bottom:1.1em;
-  line-height:100%;
 
-}
+
+
+/*
 ul.topnavlist {
   padding-top: 10px;
   white-space: nowrap;
-  margin-left:0px;
-  margin-left:0px;
   list-style-position:inside;
   list-style: disc inside;
-
+  line-height:1.0em;
+  border:thin solid black;
 }
 
 ul.topnavlist li {
@@ -933,17 +937,16 @@ ul.topnavlist li {
 }
 
 ul.topnavlist li a:hover, ul.topnavlist li a:focus, ul.topnavlist li a.active {
-    background-color: #eeeeee;
+    background-color: #FAEBD7;
     color: black;
-  text-decoration:none;
-
+    text-decoration:none;
+    line-height:1.6em;
 }
 
 ul.topnavlist li a {
-    /* The normal, unselected tabs. They are all links */
+
     color: #555;
   font-weight:bold;
-    height: 1.5em;
     padding: 0em .5em 0em;
      text-decoration:none;
   background-color:white;
@@ -951,10 +954,11 @@ ul.topnavlist li a {
 }
 
 ul.topnavlist li a.selected {
-    /* The selected tab. There's only one of these */
+
     color: #555;
     font-weight: normal;
 }
+*/
 ol.remove-margin-left {
   margin-left:-3em;
 }
@@ -977,7 +981,7 @@ legend.group_form{
 
 /* highlight active links for WCAG 2.0 conformance */
 a:active,a:hover,a:focus{
-  background-color:#F6EAD6;
+  background-color:#FAEBD7;
   color:#000000;
 }
 
@@ -1103,14 +1107,22 @@ border-radius:.8em .8em .8em .8em;
 
 
 /* Navigation tab style */
+
+
+div.topnavlistcontainer {
+  margin-left:-2.5em;
+}
+
 .navigation a
 {
   color: #000;
   background-color: #ffffff;
   text-decoration: none;
   padding-left: 1em;
-  padding-right: 1em;
-  font-weight:700;
+  padding-right: 1em;  
+  padding-top: .2em;
+  padding-bottom: -.1em;
+  font-weight:500;
   text-decoration:underline;
   margin-left:.5em;
   border-left:thin solid #cccccc;
@@ -1118,63 +1130,55 @@ border-radius:.8em .8em .8em .8em;
   border-top:thin solid #cccccc;
   border-radius:.3em .3em 0em 0em;
   -moz-border-radius:.3em .3em 0em 0em;
-
 } 
 
-.navigation a:hover
+.navigation li
 {
-  color: #fff;
-  background: #eeeeee;
-  text-decoration:underline;
+  list-style: none;
+  list-style-position:inside;
+  display: inline-block;
+  margin: 0;
 }
-
 .navigation a:hover
 {
-  background-color: #eeeeee;
-}
-.navigation a:active span
-{
-  background-color:#eeeeee;
-
+  color: #fff;
+  background: #FAEBD7;
+  text-decoration:underline;
 
+  padding-bottom: -.4em;
+  padding-top: .2em;
+  padding-bottom: .1em;
 }
 
-.navigation ul
+.navigation a.active 
 {
-  list-style: none;
-  padding: 0;
-  margin: 0
-
+  background-color:#FAEBD7;
+  padding-bottom: -.6em;
+  font-weight:700;
+  padding-top: .2em;
+  padding-bottom: .1em;
 }
 
-.navigation li
-{
-  list-style: none;
-  list-style-position:inside;
-  display: inline-block;
-  float: left;
-  margin: 0;
-
-
-
-}
 #logo{
   float:left;
   clear:right;
-margin-left:2em;
+  margin-left:2em;
 
 }
 
 
 ul.navigation li a:hover, ul.navigation li a:focus, ul.navigation li a.active {
-      background-color: #eeeeee; 
+      background-color:#FAEBD7; 
       color: #000000;
       text-decoration:none;
+
+
 }
 
 ul.navigation li a.active{
-      background-color: #eeeeee; 
+      background-color: #FAEBD7; 
       padding-right: 10px;
+      
 }
 
 /* course search result display */
@@ -1187,7 +1191,6 @@ white-space:nowrap;
 font-size:.8em;
 width:33em;
 float:right;
-margin-right:3em;
 
 }
 #search_text_at_header{
@@ -1205,7 +1208,6 @@ margin-right:3em;
 }
 
 li.course {
-  font-family: 'Droid Sans', Verdana, Arial, sans-serif;
   font-size:smaller;
   margin:1em 0;
 }
@@ -1378,7 +1380,7 @@ table.etabbed-table td.tab-spacer {
        width:5%;
 }
 .editor_tab:hover, .editor_tab input[type=submit]:hover{
-       background-color:#eeeeee;
+       background-color:#FAEBD7;
 }
 
 .editor_tab_selected{
@@ -1387,7 +1389,7 @@ table.etabbed-table td.tab-spacer {
        border-right: 1px solid #cccccc;
        border-bottom:0;
        padding: 0em .5em 0em .5em ;
-       background-color: #eeeeee;
+       background-color: #FAEBD7;
        font-weight:bold;
        white-space: nowrap;
        text-decoration:none;