Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-18 03:30:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into readme-box

Browse Source 
Conflicts:
	web/js/main.js
This commit is contained in:
Michał Prochowski
2012-06-14 00:40:44 +02:00
parent c6de3bb8c8 d77f05d825
commit 0b8ec9b4bd
10 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/blame.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

2
views/commit.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

2
views/commits.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

2
views/error.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

2
views/file.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

2
views/navigation.twig
View File

@@ -6,7 +6,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="{{ baseurl }}">Gitlist</a> <a class="brand" href="{{ baseurl }}">GitList</a>
<div class="nav-collapse"> <div class="nav-collapse">
<ul class="nav pull-right"> <ul class="nav pull-right">
<li><a href="https://github.com/klaussilveira/gitlist/">About</a></li> <li><a href="https://github.com/klaussilveira/gitlist/">About</a></li>

2
views/rss.twig
View File

@@ -2,7 +2,7 @@
<rss version="2.0"> <rss version="2.0">
<channel> <channel>
<title>Latest commits in {{ repo }}:{{ branch }}</title> <title>Latest commits in {{ repo }}:{{ branch }}</title>
<description>RSS provided by Gitlist</description> <description>RSS provided by GitList</description>
<link>{{ baseurl }}/</link> <link>{{ baseurl }}/</link>
{% for commit in commits %} {% for commit in commits %}

2
views/stats.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

2
views/tree.twig
View File

@@ -1,5 +1,5 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block title %}Gitlist{% endblock %} {% block title %}GitList{% endblock %}
{% block body %} {% block body %}
{% include 'navigation.twig' %} {% include 'navigation.twig' %}

21
web/js/main.js
View File

@@ -1,17 +1,18 @@
$(function () { $(function () {
$('.dropdown-toggle').dropdown(); $('.dropdown-toggle').dropdown();
var mode = $('#sourcecode').attr('language');
CodeMirror.fromTextArea(document.getElementById("sourcecode"), { if ($('#sourcecode').length) {
lineNumbers: true, var mode = $('#sourcecode').attr('language');
matchBrackets: true, CodeMirror.fromTextArea(document.getElementById("sourcecode"), {
lineWrapping: true, lineNumbers: true,
readOnly: true, matchBrackets: true,
mode: mode lineWrapping: true,
}); readOnly: true,
}); mode: mode
});
};
if ($('#readme-content').length) { if ($('#readme-content').length) {
var converter = new Showdown.converter(); var converter = new Showdown.converter();
$('#readme-content').html(converter.makeHtml($('#readme-content').text())); $('#readme-content').html(converter.makeHtml($('#readme-content').text()));
} }