Integrate admin menu into user menu and add user menu extension

James Moger

2014-04-22 859deba551b5e6850fb6331084493a402cecce45

 src/main/java/com/gitblit/wicket/pages/RootPage.html

@@ -14,7 +14,7 @@
                     <span class="icon-bar"></span>

                </a>

            <a class="brand" wicket:id="rootLink">

               <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>

               <img src="logo.png" height="45" width="120" class="logo"/>

            </a>

            

            <div class="nav-collapse">

@@ -40,7 +40,7 @@
            <span class="form-search">

               <input wicket:id="username" class="input-small" type="text" />

               <input wicket:id="password" class="input-small" type="password" />

               <button class="btn btn-primary" type="submit"><wicket:message key="gb.login"></wicket:message></button>

               <button class="btn" type="submit"><wicket:message key="gb.login"></wicket:message></button>

            </span>

         </form>

      </li>

@@ -51,16 +51,18 @@
      <li class="dropdown">

         <a data-toggle="dropdown" class="dropdown-toggle" style="text-decoration: none;" href="#"><span wicket:id="username"></span> <b class="caret"></b></a>

           <ul class="dropdown-menu">

              <li style="color:#ccc;padding-left:15px;font-weight:bold;"><span wicket:id="displayName"></span></li>

              <li class="divider"></li>

               <li><a wicket:id="newRepository"><wicket:message key="gb.newRepository"></wicket:message></a></li>

               <li><a wicket:id="myProfile"><wicket:message key="gb.myProfile"></wicket:message></a></li>

               <li><a wicket:id="changePassword"><wicket:message key="gb.changePassword"></wicket:message></a></li>

               <li class="divider"></li>

               <span wicket:id="standardMenu"></span>

               <span wicket:id="adminMenu"></span>

               <span wicket:id="extensionsMenu"></span>

              <li><a wicket:id="logout"><wicket:message key="gb.logout"></wicket:message></a></li>

         </ul>

      </li>

   </wicket:fragment>



   <wicket:fragment wicket:id="submenuFragment">

      <li style="color:#ccc;padding-left:15px;font-weight:bold;"><span wicket:id="submenuTitle"></span></li>

      <li wicket:id="submenuItem"><span wicket:id="submenuLink"></span></li>

   </wicket:fragment>

   

</wicket:extend>

</body>