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

Conflicts: web/js/main.js
klaussilveira · Jun 13, 2012 · 0b8ec9b · 0b8ec9b
2 parents c6de3bb + d77f05d
commit 0b8ec9b
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 19 deletions.
diff --git a/views/blame.twig b/views/blame.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

diff --git a/views/commit.twig b/views/commit.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

diff --git a/views/commits.twig b/views/commits.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

diff --git a/views/error.twig b/views/error.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

diff --git a/views/file.twig b/views/file.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

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

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

diff --git a/views/stats.twig b/views/stats.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

diff --git a/views/tree.twig b/views/tree.twig
@@ -1,5 +1,5 @@
 {% extends 'layout.twig' %}
-{% block title %}Gitlist{% endblock %}
+{% block title %}GitList{% endblock %}
 
 {% block body %}
 {% include 'navigation.twig' %}

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