Merged #33 "Merge overrides in addition to merging the normal settings"

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

 src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html

@@ -8,49 +8,60 @@


   <div wicket:id="repositoryUrlPanel"></div>

   <div wicket:id="applicationMenusPanel"></div>



   <div wicket:id="repositoryIndicators"></div>

   

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

      <div class="btn-toolbar" style="margin: 0px;">

         <div class="btn-group repositoryUrlContainer">

            <img style="vertical-align: middle;padding: 0px 0px 1px 3px;" wicket:id="accessRestrictionIcon"></img>

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

               <span class="repositoryUrl">

               <div class="repositoryUrl">

                  <span wicket:id="primaryUrl">[repository primary url]</span>

                  <span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>

               </span>

               </div>

               <span class="hidden-phone hidden-tablet repositoryUrlRightCap" wicket:id="primaryUrlPermission">[repository primary url permission]</span>

            </div>

      </div>

   </wicket:fragment>

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

      <div>

            <div wicket:id="workingCopyIndicator"></div>

         <div wicket:id="forksProhibitedIndicator"></div>

      </div>

   </wicket:fragment>

   

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

      <div class="btn-toolbar" style="margin: 4px 0px 0px 0px;">

         <div class="btn-group" wicket:id="appMenus">

               <a class="btn btn-mini btn-appmenu" data-toggle="dropdown" href="#">   				
                <span wicket:id="applicationName"></span>

                <span class="caret"></span>

               </a>

               <ul class="dropdown-menu applicationMenu">

                  <li>

                     <div class="applicationHeaderMenuItem">

                        <div style="float:right">

                           <img style="padding-right: 5px;vertical-align: middle;" wicket:id="applicationIcon"></img>

                        </div>

                        <span class="applicationTitle" wicket:id="applicationTitle"></span>

                     </div>

                  </li>

                  <li><div class="applicationHeaderMenuItem"><span wicket:id="applicationDescription"></span></div></li>

                  <li><div class="applicationLegalMenuItem"><span wicket:id="applicationLegal"></span></div></li>

   					
                  <li class="divider" style="margin: 5px 1px 0px 1px;clear:both;" ></li>

   				
                  <li class="action" wicket:id="actionItems">

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

                  </li>

               </ul>

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

            </div>

      </div>

   </wicket:fragment>

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

      <a class="btn btn-mini btn-appmenu" data-toggle="dropdown" href="#">   				
          <span wicket:id="applicationName"></span>

          <span class="caret"></span>

         </a>

         <ul class="dropdown-menu applicationMenu">

            <li>

               <div class="applicationHeaderMenuItem">

                  <div style="float:right">

                     <img style="padding-right: 5px;vertical-align: middle;" wicket:id="applicationIcon"></img>

                  </div>

                  <span class="applicationTitle" wicket:id="applicationTitle"></span>

               </div>

            </li>

            <li><div class="applicationHeaderMenuItem"><span wicket:id="applicationDescription"></span></div></li>

            <li><div class="applicationLegalMenuItem"><span wicket:id="applicationLegal"></span></div></li>

   			
            <li class="divider" style="margin: 5px 1px 0px 1px;clear:both;" ></li>

   		
            <li class="action" wicket:id="actionItems">

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

            </li>

         </ul>

   </wicket:fragment>

   

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

@@ -86,6 +97,18 @@
             scale="noscale"

             allowScriptAccess="always"></object>

   </wicket:fragment>

		


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

      <div class="repositoryIndicator">

         <span class="alert alert-info"><i class="icon-exclamation-sign"></i>&nbsp;<span class="hidden-phone" wicket:id="workingCopy">[working copy]</span></span>

      </div>

   </wicket:fragment>



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

      <div class="repositoryIndicator">

         <span class="alert alert-error"><i class="icon-ban-circle"></i>&nbsp;<span class="hidden-phone" wicket:id="forksProhibited">[forks prohibited]</span></span>

      </div>

   </wicket:fragment>

			
</wicket:panel>

</html>