Added updated files

Author: danielwaghorn

README.md

@@ -21,6 +21,6 @@ The folders in this repo are as follows:
 2. Copy the contents of `libraries` and `models` into their respective folders in your `application` directory.
 3. Import the library whenever you need to output navigation; typically your header partial view using:
 ```php
-$this->load->library('ci-navigation');
+$this->load->library('navigation');
 ```
 You can also autoload it if you need navigation on every page.

libraries/Navigation.php

@@ -138,7 +138,7 @@ function outputItem($item) {
         /**
          * Outputs the markup for a single item.
          * @param item : query row for a single nav item.
-         * @returns output : string composed of HTML to be rendered
+         * @return output : string composed of HTML to be rendered
          */
 
         $output = '';
@@ -186,20 +186,32 @@ function renderDropdown($subItems) {
         /**
          * Takes subitems and returns markup.
          * @param subItems : Query result containing nav items
-         * @returns output : string composed of HTML to be rendered
+         * @return output : string composed of HTML to be rendered
          */
 
         $output = $this->_dropdown_open;
 
         foreach ($subItems->result() as $item) {
+            $subOutput = $this->_item_open;
+            $classes = '';
 
             // Check if current page and open item
             if ($this->isCurrentPage($item->ItemLink)) {
-                $output .= $this->_item_open_active;
-            } else {
-                $output .= $this->_item_open;
+                $classes .= $this->_item_open_active_class . ' ';
             }
 
+            if (!is_null($subItems) && count($subItems->result()) > 0){
+                // See if we have dropdown
+                $classes .= $this->_item_open_dropdown_class . ' ';
+            }
+
+            if(!strcmp($classes,'') == 0) {
+                // If classes to add them append to open tag
+                $subOutput = str_replace('>',' class="' . $classes . '">',$subOutput);
+            }
+
+            $output .= $subOutput;
+
             // Output link
             $output .= $this->bindAnchor($item->ItemLink, $item->ItemHumanName);
 
@@ -217,7 +229,7 @@ public function generateNav_fromName($menu_name)
         /**
          * Resolves a menu name to ID then returns the menu output.
          * @param menu_name : string identifier of the menu as in CI-Nav-Menus
-         * @returns output : string composed of HTML to be rendered.
+         * @return output : string composed of HTML to be rendered.
          */
         $menu_id = $this->CI->nav->getMenuID($menu_name);
         return $this->generateNav_fromID($menu_id);
@@ -228,7 +240,7 @@ public function generateNav_fromID($menu_id) {
          * Generates output for menu from a menu ID as specified in
          * CI-Nav-Menus.
          * @param menu_id : int ID of the menu to be generate
-         * @returns output : string composed of HTML to be rendered.
+         * @return output : string composed of HTML to be rendered.
          */
 
         // Open Container
@@ -253,7 +265,7 @@ public function generateNav_fromID($menu_id) {
     public function generateRoleBasedNav() {
         /**
          * Outputs navigation selectively based on user authentication
-         * @returns HTML markup for navigation
+         * @return HTML markup for navigation
          */
 
         if (!$this->CI->ion_auth->logged_in()){

models/nav_model.php

@@ -21,7 +21,7 @@ public function getMenuID($menu_name) {
         /**
          * Returns the id from associated menu handle
          * @param $menu_name : string name associated to menu defined in CI-Nav-Menus
-         * @returns int menu ID otherwise -1;
+         * @return int menu ID otherwise -1;
          */
         if (isset($menu_name) && ctype_alnum ($menu_name)) {
             $query = $this->db->query('SELECT `MenuID` FROM `CI-Nav-Menus` WHERE `MenuName` = ?',array($menu_name));
@@ -37,7 +37,7 @@ public function getTopLevelNav_byName($menu_name) {
          * Returns the top level of a menu
          * @param $menu_name : String handle of menu e.g. 'public'
          *  as defined in CI-Nav-Menus
-         * @returns : Query with result, if invalid NULL
+         * @return : Query with result, if invalid NULL
          */
 
         // Check $nav_name is not null
@@ -55,7 +55,7 @@ public function getTopLevelNav_byID($menu_ID) {
         /**
          * Returns the top level of a menu
          * @param $menu_ID : int ID of menu as defined in CI-Nav-Menus
-         * @returns : Query with result
+         * @return : Query with result
          */
 
         if (isset($menu_ID) && $menu_ID != -1 && ctype_digit($menu_ID)) {
@@ -78,7 +78,7 @@ public function getSubItems($item_ID) {
          * refs ItemID in CI-Nav-Items
          * @param $item_ID : int ID of menu item as defined in
          * CI-Nav-Items
-         * @returns : Query with result of MenuItems
+         * @return : Query with result of MenuItems
          */
 
         if (isset($item_ID) && ctype_digit($item_ID)) {