githubFork/gitblit.git - Solinfo Gitblit

parent: a098da74 | patch | commit | ignore whitespace

Move admin links. Drop extra GitBlit link. Line numbers on Blob page.

James Moger

2011-05-16 7812236b90f39fd92699017f376f1b50c4ea24cb

Move admin links. Drop extra GitBlit link. Line numbers on Blob page.

6 files modified

	src/com/gitblit/utils/JGitUtils.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/com/gitblit/wicket/BasePage.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/com/gitblit/wicket/pages/BlobPage.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/com/gitblit/wicket/pages/RepositoriesPage.html	10 ●●●●● patch \| view \| raw \| blame \| history
	src/com/gitblit/wicket/pages/RepositoriesPage.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/com/gitblit/wicket/resources/gitblit.css	38 ●●●●● patch \| view \| raw \| blame \| history

 src/com/gitblit/utils/JGitUtils.java

@@ -80,6 +80,9 @@
    public static List<String> getNestedRepositories(File repositoriesFolder, File folder, boolean exportAll, boolean readNested) {

        String basefile = repositoriesFolder.getAbsolutePath();

        List<String> list = new ArrayList<String>();

        if (folder == null || !folder.exists()) {

            return list;

        }

        for (File file : folder.listFiles()) {

            if (file.isDirectory() && !file.getName().equalsIgnoreCase(Constants.DOT_GIT)) {

                // if this is a git repository add it to the list


 src/com/gitblit/wicket/BasePage.html

@@ -32,7 +32,7 @@
        <!-- page footer -->

        <div class="page_footer">

            <div style="float:right">

                <a href="http://gitblit.com"><span wicket:id="gbVersion"></span></a> 
                <span wicket:id="gbVersion"></span> 
            </div>

            <div wicket:id="userPanel">[user panel]</div>

        </div>


 src/com/gitblit/wicket/pages/BlobPage.java

@@ -75,7 +75,7 @@
            case 1:

                // PrettyPrint blob text

                c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));

                WicketUtils.setCssClass(c, "prettyprint");

                WicketUtils.setCssClass(c, "prettyprint linenums");

                break;

            case 2:

                // TODO image blobs


 src/com/gitblit/wicket/pages/RepositoriesPage.html

@@ -10,12 +10,12 @@
</wicket:head>



<body>

<wicket:extend>

    <div wicket:id="adminPanel">[admin links]</div>

<wicket:extend>	
    <div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div>

    

    <div style="text-align:center;padding-top:20px;" wicket:id="feedback">[Feedback Panel]</div>

    <div class="markdown" style="padding-top:5px;" wicket:id="repositoriesMessage">[repositories message]</div>

    

    <div class="markdown" wicket:id="repositoriesMessage">[repositories message]</div>

    <div style="padding-top:5px;" wicket:id="adminPanel">[admin links]</div>

        

    <table class="repositories">

        <tr>

@@ -40,7 +40,7 @@
    

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

        <!-- page nav links -->    

        <div class="page_nav">

        <div style="text-align: right;" class="admin_nav">

            <a wicket:id="newRepository"><wicket:message key="gb.newRepository"></wicket:message></a> | <a wicket:id="newUser"><wicket:message key="gb.newUser"></wicket:message></a> | <a wicket:id="editUsers"><wicket:message key="gb.editUsers"></wicket:message></a>

        </div>    

    </wicket:fragment>


 src/com/gitblit/wicket/pages/RepositoriesPage.java

@@ -96,9 +96,6 @@
            }

        }

        Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);

        if (!showAdmin) {

            WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px");

        }

        add(repositoriesMessage);



        final Map<AccessRestrictionType, String> accessRestrictionTranslations = getAccessRestrictions();


 src/com/gitblit/wicket/resources/gitblit.css

@@ -17,8 +17,7 @@
    background-color: #ffffff;

    color: #000000;

    margin-right: auto;

    margin-left: auto;

    margin-top: none;

    margin-left: auto;    
    padding: 0px;

    background: url(background.png) repeat-x scroll 0 0 #FFFFFF;

}

@@ -144,7 +143,7 @@
}



div.page_header a:hover {

    color: E66C2C;

    color: #E66C2C;

    text-decoration: underline;

}



@@ -180,6 +179,18 @@


div.page_nav2 {

    padding: 2px 5px 7px 5px;    

}



div.admin_nav {

    padding: 5px 5px 5px 2px;	
}



div.admin_nav a {

    text-decoration: none;

}



div.admin_nav a:hover {	
    text-decoration: underline;

}



div.search {

@@ -670,4 +681,23 @@
    font-weight: bold;    

    padding:0;

    margin:0;

}
}



/* google-code-prettify line numbers */

li.L0,

li.L1,

li.L2,

li.L3,

li.L4,

li.L5,

li.L6,

li.L7,

li.L8,

li.L9 { color: #888; border-left: 1px solid #ccc; padding-left:5px; list-style-type: decimal !important; }



/* Alternate shading for lines */

li.L1,

li.L3,

li.L5,

li.L7,

li.L9 { background: #fafafa !important; }

			@@ -80,6 +80,9 @@
			public static List<String> getNestedRepositories(File repositoriesFolder, File folder, boolean exportAll, boolean readNested) {
			String basefile = repositoriesFolder.getAbsolutePath();
			List<String> list = new ArrayList<String>();
			if (folder == null \|\| !folder.exists()) {
			return list;
			}
			for (File file : folder.listFiles()) {
			if (file.isDirectory() && !file.getName().equalsIgnoreCase(Constants.DOT_GIT)) {
			// if this is a git repository add it to the list

			@@ -32,7 +32,7 @@
			<!-- page footer -->
			<div class="page_footer">
			<div style="float:right">
			<a href="http://gitblit.com"><span wicket:id="gbVersion"></span></a>
			<span wicket:id="gbVersion"></span>
			</div>
			<div wicket:id="userPanel">[user panel]</div>
			</div>

			@@ -75,7 +75,7 @@
			case 1:
			// PrettyPrint blob text
			c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));
			WicketUtils.setCssClass(c, "prettyprint");
			WicketUtils.setCssClass(c, "prettyprint linenums");
			break;
			case 2:
			// TODO image blobs

			@@ -10,12 +10,12 @@
			</wicket:head>

			<body>
			<wicket:extend>
			<div wicket:id="adminPanel">[admin links]</div>
			<wicket:extend>
			<div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div>

			<div style="text-align:center;padding-top:20px;" wicket:id="feedback">[Feedback Panel]</div>
			<div class="markdown" style="padding-top:5px;" wicket:id="repositoriesMessage">[repositories message]</div>

			<div class="markdown" wicket:id="repositoriesMessage">[repositories message]</div>
			<div style="padding-top:5px;" wicket:id="adminPanel">[admin links]</div>

			<table class="repositories">
			<tr>
			@@ -40,7 +40,7 @@

			<wicket:fragment wicket:id="adminLinks">
			<!-- page nav links -->
			<div class="page_nav">
			<div style="text-align: right;" class="admin_nav">
			<a wicket:id="newRepository"><wicket:message key="gb.newRepository"></wicket:message></a> \| <a wicket:id="newUser"><wicket:message key="gb.newUser"></wicket:message></a> \| <a wicket:id="editUsers"><wicket:message key="gb.editUsers"></wicket:message></a>
			</div>
			</wicket:fragment>

			@@ -96,9 +96,6 @@
			}
			}
			Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);
			if (!showAdmin) {
			WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px");
			}
			add(repositoriesMessage);

			final Map<AccessRestrictionType, String> accessRestrictionTranslations = getAccessRestrictions();

			@@ -17,8 +17,7 @@
			background-color: #ffffff;
			color: #000000;
			margin-right: auto;
			margin-left: auto;
			margin-top: none;
			margin-left: auto;
			padding: 0px;
			background: url(background.png) repeat-x scroll 0 0 #FFFFFF;
			}
			@@ -144,7 +143,7 @@
			}

			div.page_header a:hover {
			color: E66C2C;
			color: #E66C2C;
			text-decoration: underline;
			}

			@@ -180,6 +179,18 @@

			div.page_nav2 {
			padding: 2px 5px 7px 5px;
			}

			div.admin_nav {
			padding: 5px 5px 5px 2px;
			}

			div.admin_nav a {
			text-decoration: none;
			}

			div.admin_nav a:hover {
			text-decoration: underline;
			}

			div.search {
			@@ -670,4 +681,23 @@
			font-weight: bold;
			padding:0;
			margin:0;
			}
			}

			/* google-code-prettify line numbers */
			li.L0,
			li.L1,
			li.L2,
			li.L3,
			li.L4,
			li.L5,
			li.L6,
			li.L7,
			li.L8,
			li.L9 { color: #888; border-left: 1px solid #ccc; padding-left:5px; list-style-type: decimal !important; }

			/* Alternate shading for lines */
			li.L1,
			li.L3,
			li.L5,
			li.L7,
			li.L9 { background: #fafafa !important; }