Gitblit

\ No newline at end of file diff --git a/resources/bootstrap.gb.css b/resources/bootstrap.gb.css index f7c2f8ee..a6c23bf6 100644 --- a/resources/bootstrap.gb.css +++ b/resources/bootstrap.gb.css @@ -3,7 +3,7 @@ body, input, select { } ul, ol { - margin:0 !important; + margin-bottom: 10px !important; } hr { @@ -77,6 +77,7 @@ pre, code, pre.prettyprint, pre.plainprint { font-size:12px; border:0px; padding: 0; + line-height: 1.35em; } table { @@ -154,6 +155,11 @@ img.inlineIcon { padding-right: 1px; } +img.overview { + float:right; + border:1px solid #CCCCCC; +} + div.header, div.commitHeader, table.repositories th { background-color:#e0e0e0; background-repeat:repeat-x; @@ -223,26 +229,41 @@ div.search input { -webkit-border-radius:0;-moz-border-radius:0x;border-radius:0; vertical-align: top; background: url(search-icon.png) no-repeat 4px center; - color: #ddd; background-color: transparent; border: 1px solid transparent; + outline: none; padding: 2px 2px 2px 22px; + text-shadow: none; margin: 0px; + + color: #ddd; } div.search input:hover, div.search input:focus { - background: url(search-icon.png) no-repeat 4px center; - color: white; + background-color: transparent; + border: 1px solid transparent; + padding: 2px 2px 2px 22px; + text-shadow: none; + + color: #ddd; border-bottom: 1px solid #ff9900; - outline: none; } -div.search input:focused { - background: url(search-icon.png) no-repeat 4px center; +div.search input:focus { + color: white; +} + +/* div.search input:focused { */ +/* background-color: transparent; */ +/* border: 1px solid transparent; */ +/* padding: 2px 2px 2px 22px; */ +/* text-shadow: none; */ +/* } */ + +div.login input:focus { + background-color: rgba(255, 255, 255, 0.6); + text-shadow: none; color: white; - border-bottom: 1px solid #ff9900; - outline: none; - padding: 0 !important; } div.commit_message { diff --git a/resources/login.mkd b/resources/login.mkd new file mode 100644 index 00000000..5b8e89df --- /dev/null +++ b/resources/login.mkd @@ -0,0 +1,3 @@ +## Please Login + +Pleaes enter your credentials to access this Gitblit site. diff --git a/src/com/gitblit/build/BuildSite.java b/src/com/gitblit/build/BuildSite.java index de4f071f..0746a6b7 100644 --- a/src/com/gitblit/build/BuildSite.java +++ b/src/com/gitblit/build/BuildSite.java @@ -91,7 +91,7 @@ public class BuildSite { System.out.println(MessageFormat.format("Generating site from {0} Markdown Docs in {1} ", markdownFiles.length, sourceFolder.getAbsolutePath())); - String linkPattern = "{1}"; + String linkPattern = "

{1}

"; StringBuilder sb = new StringBuilder(); for (File file : markdownFiles) { String documentName = getDocumentName(file); diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java index 19bee6d8..452215a7 100644 --- a/src/com/gitblit/wicket/AuthorizationStrategy.java +++ b/src/com/gitblit/wicket/AuthorizationStrategy.java @@ -35,6 +35,12 @@ public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy imp @SuppressWarnings({ "unchecked", "rawtypes" }) @Override protected boolean isPageAuthorized(Class pageClass) { + if (RepositoriesPage.class.equals(pageClass)) { + // allow all requests to get to the RepositoriesPage with its inline + // authentication form + return true; + } + if (BasePage.class.isAssignableFrom(pageClass)) { boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true); boolean authenticateAdmin = GitBlit.getBoolean(Keys.web.authenticateAdminPages, true); diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 9e76a034..2aa51079 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -66,7 +66,7 @@ gb.filesRenamed = {0} files renamed gb.missingUsername = Missing Username gb.edit = edit gb.searchTypeTooltip = Select Search Type -gb.searchTooltip = Search Gitblit +gb.searchTooltip = Search {0} gb.delete = delete gb.docs = docs gb.accessRestriction = access restriction diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java index 446ab898..78e94614 100644 --- a/src/com/gitblit/wicket/pages/EditUserPage.java +++ b/src/com/gitblit/wicket/pages/EditUserPage.java @@ -182,7 +182,7 @@ public class EditUserPage extends RootSubPage { @Override public void onSubmit() { - setResponsePage(RepositoriesPage.class); + setResponsePage(UsersPage.class); } }; cancel.setDefaultFormProcessing(false); diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index 289006fa..d5a21a7a 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.FileReader; import java.io.InputStream; import java.io.InputStreamReader; +import java.text.MessageFormat; import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; @@ -28,6 +29,7 @@ import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.RepositoriesPanel; @@ -37,23 +39,40 @@ public class RepositoriesPage extends RootPage { super(); setupPage("", ""); + // check to see if we should display a login message + boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true); + if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) { + String messageSource = GitBlit.getString(Keys.web.loginMessage, "gitblit"); + String message = readMarkdown(messageSource, "login.mkd"); + Component repositoriesMessage = new Label("repositoriesMessage", message); + add(repositoriesMessage.setEscapeModelStrings(false)); + add(new Label("repositoriesPanel")); + return; + } + // Load the markdown welcome message String messageSource = GitBlit.getString(Keys.web.repositoriesMessage, "gitblit"); + String message = readMarkdown(messageSource, "welcome.mkd"); + Component repositoriesMessage = new Label("repositoriesMessage", message) + .setEscapeModelStrings(false).setVisible(message.length() > 0); + add(repositoriesMessage); + RepositoriesPanel repositories = new RepositoriesPanel("repositoriesPanel", showAdmin, + null, getAccessRestrictions()); + // push the panel down if we are hiding the admin controls and the + // welcome message + if (!showAdmin && !repositoriesMessage.isVisible()) { + WicketUtils.setCssStyle(repositories, "padding-top:5px;"); + } + add(repositories); + } + + private String readMarkdown(String messageSource, String resource) { String message = ""; if (messageSource.equalsIgnoreCase("gitblit")) { - // Read default welcome message - try { - ContextRelativeResource res = WicketUtils.getResource("welcome.mkd"); - InputStream is = res.getResourceStream().getInputStream(); - InputStreamReader reader = new InputStreamReader(is); - message = MarkdownUtils.transformMarkdown(reader); - reader.close(); - } catch (Throwable t) { - message = "Failed to read default welcome message!"; - error(message, t, false); - } + // Read default message + message = readDefaultMarkdown(resource); } else { - // Read user-supplied welcome message + // Read user-supplied message if (!StringUtils.isEmpty(messageSource)) { File file = new File(messageSource); if (file.exists()) { @@ -69,16 +88,21 @@ public class RepositoriesPage extends RootPage { } } } - Component repositoriesMessage = new Label("repositoriesMessage", message) - .setEscapeModelStrings(false).setVisible(message.length() > 0); - add(repositoriesMessage); - RepositoriesPanel repositories = new RepositoriesPanel("repositoriesPanel", showAdmin, - null, getAccessRestrictions()); - // push the panel down if we are hiding the admin controls and the - // welcome message - if (!showAdmin && !repositoriesMessage.isVisible()) { - WicketUtils.setCssStyle(repositories, "padding-top:5px;"); + return message; + } + + private String readDefaultMarkdown(String file) { + String message; + try { + ContextRelativeResource res = WicketUtils.getResource(file); + InputStream is = res.getResourceStream().getInputStream(); + InputStreamReader reader = new InputStreamReader(is); + message = MarkdownUtils.transformMarkdown(reader); + reader.close(); + } catch (Throwable t) { + message = MessageFormat.format("Failed to read default message from {0}!", file); + error(message, t, false); } - add(repositories); + return message; } } diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 777401a1..1b6ae082 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -136,8 +136,7 @@ public abstract class RepositoryPage extends BasePage { String extra = item.getModelObject(); PageRegistration pageReg = registeredPages.get(extra); item.add(new LinkPanel("extraLink", null, getString(pageReg.translationKey), - pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName)) - /*.setEnabled(!extra.equals(pageWicketId))*/); + pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName))); } }; add(extrasView); @@ -385,7 +384,7 @@ public abstract class RepositoryPage extends BasePage { void setTranslatedAttributes() { WicketUtils.setHtmlTooltip(get("searchType"), getString("gb.searchTypeTooltip")); - WicketUtils.setHtmlTooltip(get("searchBox"), getString("gb.searchTooltip")); + WicketUtils.setHtmlTooltip(get("searchBox"), MessageFormat.format(getString("gb.searchTooltip"), repositoryName)); WicketUtils.setInputPlaceholder(get("searchBox"), getString("gb.search")); } @@ -393,6 +392,10 @@ public abstract class RepositoryPage extends BasePage { public void onSubmit() { SearchType searchType = searchTypeModel.getObject(); String searchString = searchBoxModel.getObject(); + if (searchString == null) { + // FIXME IE intermittently has no searchString. Wicket bug? + return; + } for (SearchType type : SearchType.values()) { if (searchString.toLowerCase().startsWith(type.name().toLowerCase() + ":")) { searchType = type; diff --git a/src/com/gitblit/wicket/pages/RootPage.html b/src/com/gitblit/wicket/pages/RootPage.html index 0fa6cfc6..c9470923 100644 --- a/src/com/gitblit/wicket/pages/RootPage.html +++ b/src/com/gitblit/wicket/pages/RootPage.html @@ -19,9 +19,11 @@ - - - +