Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -24,13 +24,28 @@
      <p class="originRepository" style="margin-left:20px;" ><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p>

   </wicket:fragment>



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

        <span class="mega-octicon octicon-repo"></span>

    </wicket:fragment>



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

        <span class="mega-octicon octicon-mirror"></span>

    </wicket:fragment>



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

        <span class="mega-octicon octicon-repo-forked"></span>

    </wicket:fragment>

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

        <span class="mega-octicon octicon-repo-push" wicket:message="title:gb.workingCopyWarning"></span>

    </wicket:fragment>



   <div>

      <div style="padding-top:15px;padding-bottom:15px;margin-right:15px;">

         <div class="pull-right" style="text-align:right;padding-right:15px;">

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

            <div>

               <img class="inlineIcon" wicket:id="sparkleshareIcon" />

               <img class="inlineIcon" wicket:id="mirrorIcon" />

               <img class="inlineIcon" wicket:id="frozenIcon" />

               <img class="inlineIcon" wicket:id="federatedIcon" />

                          

@@ -42,11 +57,15 @@
         </div>   

         

         <div class="pageTitle" style="border:0px;">

            <div>

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

               <span class="repository" style="padding-left:3px;color:black;" wicket:id="repositoryName">[repository name]</span>

            </div>

            <span wicket:id="originRepository">[origin repository]</span>

                <div style="display:inline-block;vertical-align:top;padding-right:5px;">

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

                </div>

                <div style="display:inline-block;">

                    <div>

                  <span class="repository" style="padding-left:3px;color:black;" wicket:id="repositoryName">[repository name]</span>

                    </div>

                    <span wicket:id="originRepository">[origin repository]</span>

            </div>				
         </div>

         

         <div style="padding-left:20px;">