From 9e7b14b651cf3812718d33665529de919c05795d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 15 May 2014 08:10:20 -0400
Subject: [PATCH] Redesign the EmptyRepositoryPage
---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html | 87 +++---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 33 +-
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html | 87 +++---
src/main/java/com/gitblit/wicket/pages/create_git.md | 6
src/main/java/com/gitblit/wicket/pages/existing_git.md | 2
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html | 86 +++---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html | 91 +++---
releases.moxie | 1
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html | 88 +++---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 17
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html | 86 +++---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html | 89 +++---
12 files changed, 347 insertions(+), 326 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 86896d3..c0c243a 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -20,6 +20,7 @@
- BARNUM: Create ticket/N instead of topic/N for pt start N (ticket-61)
- Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67)
- Update the Korean translation (pr-184, ticket-69)
+ - Overhaul the EmptyRepositoryPage (ticket-73)
additions:
- Add My Tickets page (issue-215, ticket-15)
- Added CRUD functionality for Ticket Milestones (ticket-17)
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
index c5f9bc9..ebd513a 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
@@ -7,52 +7,53 @@
<body>
<wicket:extend>
<div class="container">
- <h2>Empty Repository</h2>
- <p></p>
- <div class="row">
- <div class="span10">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> is an empty repository and can not be viewed by Gitblit.
- <p></p>
- Please push some commits to <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- After you have pushed commits you may <b>refresh</b> this page to view your repository.
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>Empty Repository</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> is an empty repository and can not be viewed by Gitblit.
+ <p></p>
+ Please push some commits to <span wicket:id="pushurl"></span>
+ <hr/>
+ After you have pushed commits you may <b>refresh</b> this page to view your repository.
+ </div>
- <h3>Git Command-Line Syntax</h3>
- <span style="padding-bottom:5px;">If you do not have a local Git repository, then you should clone this repository, commit some files, and then push your commits back to Gitblit.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">If you already have a local Git repository with commits, then you may add this repository as a remote and push to it.</span>
- <p></p>
- <pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>Learn Git</h3>
- If you are unsure how to use this information, consider reviewing the <a href="http://book.git-scm.com">Git Community Book</a> or <a href="http://progit.org/book" target="_blank">Pro Git</a> for a better understanding on how to use Git.
- <p></p>
+ <h3><center>Create a new repository on the command-line</center></h3>
+
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>Learn Git</center></h2>
+ <p>If you are unsure how to use this information, consider reviewing the <a href="http://book.git-scm.com">Git Community Book</a> for a better understanding on how to use Git.</p>
+
<h4>Open Source Git Clients</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - the official, command-line Git</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - Windows file explorer integration (requires official, command-line Git)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - Git for the Eclipse IDE (based on JGit, like Gitblit)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - C# frontend for Git that features Windows Explorer and Visual Studio integration</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - a Mac OS X Git client</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>the official, command-line Git</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>Windows file explorer integration (requires official, command-line Git)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>Git for the Eclipse IDE (based on JGit, like Gitblit)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>C# frontend for Git that features Windows Explorer and Visual Studio integration</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>a Mac OS X Git client</td></tr>
+ </tbody>
+ </table>
+
<h4>Commercial/Closed-Source Git Clients</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - A Java Git and Mercurial client for Windows, Mac, and Linux</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - A free Git and Mercurial client for Windows & Mac</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - a Mac OS X Git client</li>
- </ul>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>A Java Git and Mercurial client for Windows, Mac, and Linux</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>A free Git and Mercurial client for Windows & Mac</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>a Mac OS X Git client</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
</div>
</wicket:extend>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 00bac63..b3c5243 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -15,7 +15,6 @@
*/
package com.gitblit.wicket.pages;
-import java.text.MessageFormat;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -32,7 +31,7 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
-public class EmptyRepositoryPage extends RootPage {
+public class EmptyRepositoryPage extends RepositoryPage {
public EmptyRepositoryPage(PageParameters params) {
super(params);
@@ -50,8 +49,6 @@
throw new GitblitRedirectException(SummaryPage.class, params);
}
- setupPage(repositoryName, getString("gb.emptyRepository"));
-
UserModel user = GitBlitWebSession.get().getUser();
if (user == null) {
user = UserModel.ANONYMOUS;
@@ -62,15 +59,17 @@
RepositoryUrl primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0);
String url = primaryUrl != null ? primaryUrl.url : "";
+ String createSyntax = readResource("create_git.md").replace("${primaryUrl}", url);
+ String existingSyntax = readResource("existing_git.md").replace("${primaryUrl}", url);
+
add(new Label("repository", repositoryName));
add(new RepositoryUrlPanel("pushurl", false, user, repository));
- add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url)));
- add(new Label("remoteSyntax", MessageFormat.format("git remote add origin {0}\ngit push -u origin --all\ngit push -u origin --tags", url)));
- add(new Label("upstreamSyntax", "git remote add upstream <upstream repository url>"));
+ add(new Label("createSyntax", createSyntax));
+ add(new Label("existingSyntax", existingSyntax));
}
@Override
- protected Class<? extends BasePage> getRootNavPageClass() {
- return RepositoriesPage.class;
+ protected String getPageName() {
+ return getString("gb.summary");
}
}
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
index f98cb05..0f168bf 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
@@ -9,52 +9,54 @@
<body>
<wicket:extend>
<div class="container">
- <h2>Repositorio Vacío</h2>
- <p></p>
- <div class="row">
- <div class="span7">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> es un repositorio vacío y no puede ser visto en Gitblit.
- <p></p>
- Por favor, empuja algunas consignas a <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- Después de empujar tus consignas puedes <b>refrescar</b> ésta página para ver tu repositorio.
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>Repositorio Vacío</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> es un repositorio vacío y no puede ser visto en Gitblit.
+ <p></p>
+ Por favor, empuja algunas consignas a <span wicket:id="pushurl"></span>
+ <hr/>
+ Después de empujar tus consignas puedes <b>refrescar</b> ésta página para ver tu repositorio.
+ </div>
- <h3>Sintaxis de la Línea de Comandos de Git</h3>
- <span style="padding-bottom:5px;">Si no tienes un repositiorio local Git, puedes clonar éste, consignar algunos archivos, y después empujar las consignas de vuelta a Gitblit.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">Si ya tienes un repositorio local Git con algunas consignas, puedes añadir éste como remoto y empujar desde allí.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="remoteSyntax"></pre>
- <span style="padding-bottom:5px;">Si el repositorio está pensado para mantenerse sincronizado con otro repositorio corriente-arriba, entonces puedes añadirlo.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>Aprender sobre Git</h3>
- Si no estás seguro de como usar esta información, échale un vistazo al <a href="http://book.git-scm.com">Libro de la cominidad Git</a> o <a href="http://progit.org/book" target="_blank">Pro Git</a> para una mejor compresión de como usar Git.
- <p></p>
+ <h3><center>Create a new repository on the command-line</center></h3>
+
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>Aprender sobre Git</center></h2>
+ <p>Si no estás seguro de como usar esta información, échale un vistazo al <a href="http://book.git-scm.com/es">Libro de la cominidad Git</a> para una mejor compresión de como usar Git.</p>
+
<h4>Clientes Git de Código abierto.</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - El Git oficial en línea de comandos</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - Explorador de archivos integrado en Windows (necesita Git oficial en línea de comandos)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - Git para el IDE de Eclipse (basado en JGit, como Gitblit)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - Interfaz de usuario gráfico Git en C# con integración en IE y en Visual Studio</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - Cliente Git para Mac OS X</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>El Git oficial en línea de comandos</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>Explorador de archivos integrado en Windows (necesita Git oficial en línea de comandos)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>Git para el IDE de Eclipse (basado en JGit, como Gitblit)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>Interfaz de usuario gráfico Git en C# con integración en IE y en Visual Studio</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>Cliente Git para Mac OS X</td></tr>
+ </tbody>
+ </table>
+
<h4>Clientes Git comerciales</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - aplicación Java (necesita Git oficial en línea de comandos)</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - Un cliente Git gratuito para Mac, Mercurial, y SVN</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - Cliente Git para Mac OS X</li>
- </ul>
-</div>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>aplicación Java (necesita Git oficial en línea de comandos)</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>Un cliente Git gratuito para Mac, Mercurial, y SVN</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>Cliente Git para Mac OS X</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
+</div>
</wicket:extend>
</body>
</html>
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
index 4027f0e..bd1f4f5 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
@@ -7,55 +7,54 @@
<body>
<wicket:extend>
<div class="container">
- <h2>비어있는 저장소</h2>
- <p></p>
- <div class="row">
- <div class="span10">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> 저장소는 비어 있어서 Gitblit 에서 볼 수 없습니다.
- <p></p>
- 이 Git url 에 커밋해 주세요. <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- After you have pushed commits you may <b>refresh</b> this page to view your repository.
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>비어있는 저장소</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> 저장소는 비어 있어서 Gitblit 에서 볼 수 없습니다.
+ <p></p>
+ 이 Git url 에 커밋해 주세요. <span wicket:id="pushurl"></span>
+ <hr/>
+ After you have pushed commits you may <b>refresh</b> this page to view your repository.
+ </div>
+
+ <h3><center>Create a new repository on the command-line</center></h3>
- <p></p>
- <h3>Git 명령어</h3>
- <span style="padding-bottom:5px;">로컬 Git 저장소가 없다면, 이 저장소를 클론(clone) 한 후, 몇 파일을 커밋하고, 그 커밋을 Gitblit 에 푸시(push) 하세요.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">만약 커밋된 로컬 Git 저장소가 있다면, 다음과 같이 저장소에 리모트를 추가하고 푸시(push)할 수 있습니다.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="remoteSyntax"></pre>
- <span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>Git 배우기</h3>
- 만약 사용법에 자신이 없다면, Git 사용법을 더 잘 이해하기 위해
- <a href="http://book.git-scm.com">Git Community Book</a> 또는
- <a href="http://progit.org/book" target="_blank">Pro Git</a>,
- <a href="http://dogfeet.github.com/articles/2012/progit.html" target="_blank">Pro Git 한글</a> 을 볼 것을 고려해 보세요.
- <p></p>
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>Git 배우기</center></h2>
+ <p>만약 사용법에 자신이 없다면, Git 사용법을 더 잘 이해하기 위해
+ <a href="http://book.git-scm.com/ko">Git Community Book</a> 또는 을 볼 것을 고려해 보세요.</p>
+
<h4>오픈소스 Git 클라이언트</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - 명령어 기반 공식 Git</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - 윈도의 파일 탐색기에 통합된 UI 클라이언트 (명령어 기반 공식 Git 필요)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - 이클립스 IDE 플러그인 (Gitblit 과 같은 JGit 기반)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - C# frontend for Git that features Windows Explorer and Visual Studio integration</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - a Mac OS X Git client</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>명령어 기반 공식 Git</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>윈도의 파일 탐색기에 통합된 UI 클라이언트 (명령어 기반 공식 Git 필요)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>이클립스 IDE 플러그인 (Gitblit 과 같은 JGit 기반)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>C# frontend for Git that features Windows Explorer and Visual Studio integration</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>a Mac OS X Git client</td></tr>
+ </tbody>
+ </table>
+
<h4>유료 Git 클라이언트</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - 자바 어플리케이션 (명령어 기반 공식 Git 필요)</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - A free Mac Client for Git, Mercurial, and SVN</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - a Mac OS X Git client</li>
- </ul>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>자바 어플리케이션 (명령어 기반 공식 Git 필요)</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>A free Git and Mercurial client for Windows & Mac</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>a Mac OS X Git client</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
</div>
</wicket:extend>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
index 1fc3fe8..dd58ed4 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
@@ -7,52 +7,53 @@
<body>
<wicket:extend>
<div class="container">
- <h2>Lege Repository</h2>
- <p></p>
- <div class="row">
- <div class="span10">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> is een lege repository en kan niet bekeken worden door Gitblit.
- <p></p>
- Push alstublieft een paar commits naar <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- Nadat u een commits gepushed heeft, kunt u deze pagina <b>verversen</b> om uw repository te bekijken.
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>Lege Repository</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> is een lege repository en kan niet bekeken worden door Gitblit.
+ <p></p>
+ Push alstublieft een paar commits naar <span wicket:id="pushurl"></span>
+ <hr/>
+ Nadat u een commits gepushed heeft, kunt u deze pagina <b>verversen</b> om uw repository te bekijken.
+ </div>
- <h3>Git Command-Line Syntax</h3>
- <span style="padding-bottom:5px;">Als u geen lokale Git repository heeft, kunt u deze repository clonen, er bestanden naar committen en dan uw commits terug pushen naar Gitblit.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">Als u al een lokale Git repository met commits heeft, kunt u deze repository als een remote toevoegen en er naar pushen.</span>
- <p></p>
- <pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <span style="padding-bottom:5px;">Indien uw repository bedoeld is om synchroon gehouden te worden met een upstream repository, dan kunt u deze toevoegen.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>Leer Git</h3>
- Als u niet goed weet wat u met deze informatie aan moet, raden we u aan om het <a href="http://book.git-scm.com">Git Community Book</a> of <a href="http://progit.org/book" target="_blank">Pro Git</a> te bestuderen voor een beter begrip over hoe u Git kunt gebruiken.
- <p></p>
+ <h3><center>Create a new repository on the command-line</center></h3>
+
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>Leer Git</center></h2>
+ <p>Als u niet goed weet wat u met deze informatie aan moet, raden we u aan om het <a href="http://book.git-scm.com/nl">Git Community Book</a> te bestuderen voor een beter begrip over hoe u Git kunt gebruiken.</p>
+
<h4>Open Source Git Clients</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - de officiele, command-line Git</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - Windows bestandsverkenner ingetratie (officiele command-line Git is wel nodig)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - Git voor de Eclipse IDE (gebaseerd op JGit, zoals Gitblit)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - C# frontend voor Git met Windows Explorer en Visual Studio integratie</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - een Mac OS X Git client</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>de officiele, command-line Git</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>Windows bestandsverkenner ingetratie (officiele command-line Git is wel nodig)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>Git voor de Eclipse IDE (gebaseerd op JGit, zoals Gitblit)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>C# frontend voor Git met Windows Explorer en Visual Studio integratie</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>een Mac OS X Git client</td></tr>
+ </tbody>
+ </table>
+
<h4>Commercial/Closed-Source Git Clients</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - Een Java Git, Mercurial, en SVN client applicatie (officiele command-line Git is wel nodig)</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - Een gratis Mac Client voor Git, Mercurial, en SVN</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - een Mac OS X Git client</li>
- </ul>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>Een Java Git, Mercurial, en SVN client applicatie (officiele command-line Git is wel nodig)</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>Een gratis Mac Client voor Git en Mercurial</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>een Mac OS X Git client</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
</div>
</wicket:extend>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
index 3f9db90..dd0f4a5 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
@@ -9,51 +9,53 @@
<body>
<wicket:extend>
<div class="container">
- <h2>Puste repozytorium</h2>
- <p></p>
- <div class="row">
- <div class="span10">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> jest pustym repozytorium i nie może być zaprezentowane przez Gitblit.
- <p></p>
- Wgraj, poprzez push, dowolne zmiany do lokalizacji <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- Po wgraniu zmian <b>odśwież</b> stronę, aby podejrzeć repozytorium.
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>Puste repozytorium</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> jest pustym repozytorium i nie może być zaprezentowane przez Gitblit.
+ <p></p>
+ Wgraj, poprzez push, dowolne zmiany do lokalizacji <span wicket:id="pushurl"></span>
+ <hr/>
+ Po wgraniu zmian <b>odśwież</b> stronę, aby podejrzeć repozytorium.
+ </div>
- <h3>Składnia linii poleceń GITa</h3>
- <span style="padding-bottom:5px;">Jeśli nie posiadasz lokalnego repozytorium GITa to sklonuj to repozytorium, wgraj dowolne pliki, a następnie wyślij poprzez push zmiany na Gitblit.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">Gdy posiadasz lokalne repozytorium GITa z dowolnymi zmianami, to możesz dodać to repozytorium jako remote i wysłać do niego zmiany poprzez push.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="remoteSyntax"></pre>
- <span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>Nauka GITa</h3>
- Jeżeli powyższe informacje są dla Ciebie niezrozumiałe, zapoznaj się z książką <a href="http://git-scm.com/book/pl" target="_blank">Pro Git - Wersja PL</a> dla lepszego zrozumienia, jak poprawnie używać GITa.
- <p></p>
+ <h3><center>Create a new repository on the command-line</center></h3>
+
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>Nauka GITa</center></h2>
+ <p>Jeżeli powyższe informacje są dla Ciebie niezrozumiałe, zapoznaj się z książką <a href="http://git-scm.com/book/pl" target="_blank">Pro Git - Wersja PL</a> dla lepszego zrozumienia, jak poprawnie używać GITa.</p>
+
<h4>Darmowi klienci GITa</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - Oficjalny klient, dostępny przez linię poleceń</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - Rozszerzenie eksploratora Windows (wymaga oficjalnego, dostępnego przez linię poleceń klienta)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - GIT dla edytora Eclipse (oparty o JGit, podobnie jak Gitblit)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - napisana w C# fasada na GIT, udostępniająca integrację dla Windows Explorer oraz Visual Studio</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - klient GIT na Mac OS X</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>Oficjalny klient, dostępny przez linię poleceń</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>Rozszerzenie eksploratora Windows (wymaga oficjalnego, dostępnego przez linię poleceń klienta)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>GIT dla edytora Eclipse (oparty o JGit, podobnie jak Gitblit)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>napisana w C# fasada na GIT, udostępniająca integrację dla Windows Explorer oraz Visual Studio</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>klient GIT na Mac OS X</td></tr>
+ </tbody>
+ </table>
+
<h4>Komercyjni klienci GITa</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - aplikacja napisana w Javie (wymaga oficjalnego, dostępnego przez linię poleceń klienta)</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - darmowy klient GIT, Mercurial i SVN na Mac OS X</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - klient GIT na Mac OS X</li>
- </ul>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>aplikacja napisana w Javie (wymaga oficjalnego, dostępnego przez linię poleceń klienta)</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>darmowy klient GIT, Mercurial i SVN na Mac OS X</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>klient GIT na Mac OS X</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
</div>
</wicket:extend>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
index 351fe87..0182d87 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
@@ -7,51 +7,53 @@
<body>
<wicket:extend>
<div class="container">
- <h2>Repositório Vazio</h2>
- <p></p>
- <div class="row">
- <div class="span10">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> é um repositório vazio e não pode ser visualizado pelo Gitblit.
- <p></p>
- Por favor faça o push de alguns commits para <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- Depois de ter feito push você poderá <b>atualizar</b> esta página para visualizar seu repositório.
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>Repositório Vazio</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> é um repositório vazio e não pode ser visualizado pelo Gitblit.
+ <p></p>
+ Por favor faça o push de alguns commits para <span wicket:id="pushurl"></span>
+ <hr/>
+ Depois de ter feito push você poderá <b>atualizar</b> esta página para visualizar seu repositório.
+ </div>
- <h3>Sintaxe dos comandos do Git</h3>
- <span style="padding-bottom:5px;">Se você ainda não tem um repositório local do Git, então você deve primeiro clonar este repositório, fazer commit de alguns arquivos e então fazer push desses commits para o Gitblit.</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">Se você já tem um repositório Git local com alguns commits, então você deve adicionar este repositório como uma referência remota e então fazer push.</span>
- <p></p>
- <pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>
- <span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>Aprenda Git</h3>
- Se você estiver com dúvidas sobre como ultilizar essas informações, uma sugestão seria dar uma olhada no livro <a href="http://book.git-scm.com">Git Community Book</a> ou <a href="http://progit.org/book" target="_blank">Pro Git</a> para entender melhor como usar o Git.
- <p></p>
+ <h3><center>Create a new repository on the command-line</center></h3>
+
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>Aprenda Git</center></h2>
+ <p>Se você estiver com dúvidas sobre como ultilizar essas informações, uma sugestão seria dar uma olhada no livro <a href="http://book.git-scm.com/pt-br">Git Community Book</a> para entender melhor como usar o Git.</p>
+
<h4>Alguns clients do Git que são Open Source</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - o Git oficial através de linhas de comando</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - Faz integração do Explorer do Windows com o Git (por isso requer o Git Oficial)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - Git para a IDE Eclipse (baseada no JGit, como o Gitblit)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - Interface (em C#) para o Git cuja a característica é a integração com o Windows Explorer e o Visual Studio</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - um Cliente do Git para Mac OS X</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>o Git oficial através de linhas de comando</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>Faz integração do Explorer do Windows com o Git (por isso requer o Git Oficial)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>Git para a IDE Eclipse (baseada no JGit, como o Gitblit)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>Interface (em C#) para o Git cuja a característica é a integração com o Windows Explorer e o Visual Studio</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>um Cliente do Git para Mac OS X</td></tr>
+ </tbody>
+ </table>
+
<h4>Clients do Git proprietários ou com Código Proprietário</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - Aplicação Client (em Java) para Git, Mercurial, e SVN (por isso requer o Git Oficial)</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - Client gratuito para o Mac que suporta Git, Mercurial e SVN</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - um Cliente do Git para Mac OS X</li>
- </ul>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>Aplicação Client (em Java) para Git e Mercurial (por isso requer o Git Oficial)</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>Client gratuito para o Mac que suporta Git e Mercurial</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>um Cliente do Git para Mac OS X</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
</div>
</wicket:extend>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
index 955b431..151abc4 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
@@ -7,53 +7,54 @@
<body>
<wicket:extend>
<div class="container">
- <h2>空版本库</h2>
- <p></p>
- <div class="row">
- <div class="span10">
- <div class="alert alert-success">
- <span wicket:id="repository" style="font-weight: bold;">[repository]</span> 版本库目前为空。
- Gitblit 无法查看。
- <p></p>
- 请往此网址进行推送 <span wicket:id="pushurl"></span>
- <p></p>
- <hr/>
- 当你推送完毕后你可以 <b>刷新</b> 此页面重新查看您的版本库。
- </div>
- </div>
- </div>
+<div class="markdown">
+<div class="row">
+<div class="span10 offset1">
+ <h2><center>空版本库</center></h2>
+ <div class="alert alert-info">
+ <span wicket:id="repository" style="font-weight: bold;">[repository]</span> 版本库目前为空。
+ Gitblit 无法查看。
+ <p></p>
+ 请往此网址进行推送 <span wicket:id="pushurl"></span>
+ <hr/>
+ 当你推送完毕后你可以 <b>刷新</b> 此页面重新查看您的版本库。
+ </div>
- <h3>Git 命令行格式</h3>
- <span style="padding-bottom:5px;">如果您没有本地 Git 版本库, 您可以克隆此版本库, 提交一些文件, 然后将您的提交推送回Gitblit。</span>
- <p></p>
- <pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>
- <p></p>
- <span style="padding-bottom:5px;">如果您已经有一个本地的提交过的版本库, 那么您可以将此版本库加为远程
- 版本库，并进行推送。</span>
- <p></p>
- <pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>
- <span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
- <p></p>
- <pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
- <p></p>
- <h3>学习 Git</h3>
- 如果您不明白这些信息什么意思, 您可以参考 <a href="http://book.git-scm.com">Git Community Book</a> 或者 <a href="http://progit.org/book" target="_blank">Pro Git</a> 去更加深入的学习 Git 的用法。
- <p></p>
+ <h3><center>Create a new repository on the command-line</center></h3>
+
+ <pre wicket:id="createSyntax"></pre>
+
+ <h3><center>Push an existing repository from the command-line</center></h3>
+
+ <pre wicket:id="existingSyntax"></pre>
+
+ <div class="span8 offset1">
+ <h2><center>学习 Git</center></h2>
+ <p>如果您不明白这些信息什么意思, 您可以参考 <a href="http://book.git-scm.com/zh">Git Community Book</a> 去更加深入的学习 Git 的用法。</p>
+
<h4>开源 Git 客户端</h4>
- <ul>
- <li><a href="http://git-scm.com">Git</a> - 官方, 命令行版本 Git</li>
- <li><a href="http://tortoisegit.googlecode.com">TortoiseGit</a> - 与 Windows 资源管理器集成 (需要官方, 命令行 Git 的支持)</li>
- <li><a href="http://eclipse.org/egit">Eclipse/EGit</a> - Git for the Eclipse IDE (基于 JGit, 类似 Gitblit)</li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions</a> - C# 版本的 Git 前端，与 Windows 资源管理器和 Visual Studio 集成</li>
- <li><a href="http://rowanj.github.io/gitx/">GitX-dev</a> - Mac OS X Git 客户端</li>
- </ul>
- <p></p>
+ <table>
+ <tbody>
+ <tr><td><a href="http://git-scm.com">Git</a></td><td>官方, 命令行版本 Git</td></tr>
+ <tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>与 Windows 资源管理器集成 (需要官方, 命令行 Git 的支持)</td></tr>
+ <tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>Git for the Eclipse IDE (基于 JGit, 类似 Gitblit)</td></tr>
+ <tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>C# 版本的 Git 前端，与 Windows 资源管理器和 Visual Studio 集成</td></tr>
+ <tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>Mac OS X Git 客户端</td></tr>
+ </tbody>
+ </table>
+
<h4>商业/闭源 Git 客户端</h4>
- <ul>
- <li><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a> - Java 版本的支持 Git, Mercurial 和 SVN 客户端应用 (需要官方, 命令行 Git 的支持)</li>
- <li><a href="http://www.sourcetreeapp.com/">SourceTree</a> - 免费的 Mac Git Mercurial 以及 SVN 客户端, Mercurial, and SVN</li>
- <li><a href="http://www.git-tower.com/">Tower</a> - Mac OS X Git 客户端</li>
- </ul>
+ <table>
+ <tbody>
+ <tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>Java 版本的支持 Git, Mercurial 和 SVN 客户端应用 (需要官方, 命令行 Git 的支持)</td></tr>
+ <tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>免费的 Mac Git Mercurial 以及 SVN 客户端 and Mercurial</td></tr>
+ <tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>Mac OS X Git 客户端</td></tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</div>
+</div>
</div>
</wicket:extend>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index a0c9ce0..fcf659a 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -108,7 +108,7 @@
error(MessageFormat.format(getString("gb.repositoryNotSpecifiedFor"), getPageName()), true);
}
- if (!getRepositoryModel().hasCommits) {
+ if (!getRepositoryModel().hasCommits && getClass() != EmptyRepositoryPage.class) {
throw new RestartResponseException(EmptyRepositoryPage.class, params);
}
@@ -147,6 +147,16 @@
}
}
}
+
+ showAdmin = false;
+ if (app().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
+ boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
+ showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
+ } else {
+ showAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
+ }
+ isOwner = GitBlitWebSession.get().isLoggedIn()
+ && (getRepositoryModel().isOwner(GitBlitWebSession.get().getUsername()));
// register the available navigation links for this page and user
List<NavLink> navLinks = registerNavLinks();
@@ -195,9 +205,14 @@
navLinks.add(new PageNavLink("gb.summary", SummaryPage.class, params));
} else {
navLinks.add(new PageNavLink("gb.summary", SummaryPage.class, params));
-// pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
+ // pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
navLinks.add(new PageNavLink("gb.reflog", ReflogPage.class, params));
}
+
+ if (!model.hasCommits) {
+ return navLinks;
+ }
+
navLinks.add(new PageNavLink("gb.commits", LogPage.class, params));
navLinks.add(new PageNavLink("gb.tree", TreePage.class, params));
if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(model) || app().tickets().hasTickets(model))) {
@@ -229,16 +244,6 @@
navLinks.addAll(ext.getNavLinks(user, model));
}
- // Conditionally add edit link
- showAdmin = false;
- if (app().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
- boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
- showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
- } else {
- showAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
- }
- isOwner = GitBlitWebSession.get().isLoggedIn()
- && (model.isOwner(GitBlitWebSession.get().getUsername()));
return navLinks;
}
@@ -311,7 +316,7 @@
}
// (un)star link allows a user to star a repository
- if (user.isAuthenticated) {
+ if (user.isAuthenticated && model.hasCommits) {
PageParameters starParams = DeepCopier.copy(getPageParameters());
starParams.put(PARAM_STAR, !user.getPreferences().isStarredRepository(model.name));
String toggleStarUrl = getRequestCycle().urlFor(getClass(), starParams).toString();
@@ -338,7 +343,7 @@
} else {
String fork = app().repositories().getFork(user.username, model.name);
boolean hasFork = fork != null;
- boolean canFork = user.canFork(model);
+ boolean canFork = user.canFork(model) && model.hasCommits;
if (hasFork || !canFork) {
// user not allowed to fork or fork already exists or repo forbids forking
diff --git a/src/main/java/com/gitblit/wicket/pages/create_git.md b/src/main/java/com/gitblit/wicket/pages/create_git.md
new file mode 100644
index 0000000..309ac67
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/create_git.md
@@ -0,0 +1,6 @@
+ touch README.md
+ git init
+ git add README.md
+ git commit -m "first commit"
+ git remote add origin ${primaryUrl}
+ git push -u origin master
diff --git a/src/main/java/com/gitblit/wicket/pages/existing_git.md b/src/main/java/com/gitblit/wicket/pages/existing_git.md
new file mode 100644
index 0000000..0a6fad9
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/existing_git.md
@@ -0,0 +1,2 @@
+ git remote add origin ${primaryUrl}
+ git push -u origin master
--
Gitblit v1.9.1