James Moger
13 years ago
6 changed files with 44 additions and 14 deletions
+ 3
- 0
src/com/gitblit/utils/JGitUtils.java
View File
| @@ -80,6 +80,9 @@ public class JGitUtils { | |||
| 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 | |||
+ 1
- 1
src/com/gitblit/wicket/BasePage.html
View File
| @@ -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> | |||
+ 1
- 1
src/com/gitblit/wicket/pages/BlobPage.java
View File
| @@ -75,7 +75,7 @@ public class BlobPage extends RepositoryPage { | |||
| 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 | |||
+ 5
- 5
src/com/gitblit/wicket/pages/RepositoriesPage.html
View File
| @@ -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> | |||
+ 0
- 3
src/com/gitblit/wicket/pages/RepositoriesPage.java
View File
| @@ -96,9 +96,6 @@ public class RepositoriesPage extends BasePage { | |||
| } | |||
| } | |||
| Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false); | |||
| if (!showAdmin) { | |||
| WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px"); | |||
| } | |||
| add(repositoriesMessage); | |||
| final Map<AccessRestrictionType, String> accessRestrictionTranslations = getAccessRestrictions(); | |||
+ 34
- 4
src/com/gitblit/wicket/resources/gitblit.css
View File
| @@ -17,8 +17,7 @@ body { | |||
| 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:visited { | |||
| } | |||
| div.page_header a:hover { | |||
| color: E66C2C; | |||
| color: #E66C2C; | |||
| text-decoration: underline; | |||
| } | |||
| @@ -182,6 +181,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 { | |||
| color:yellow; | |||
| text-align:right; | |||
| @@ -670,4 +681,23 @@ span .headRef { | |||
| 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; } | |||
Loading…