git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: e0cf2cf)
Integrate local copy of Bootstrap and Font-Awesome
authorJustin J. Novack <jnovack@gmail.com>
Sun, 7 Oct 2012 02:27:42 +0000 (22:27 -0400)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 24 Oct 2012 12:59:25 +0000 (14:59 +0200)
data/config.default.php patch | blob | history
data/templates/base.htm patch | blob | history

diff --git a/data/config.default.php b/data/config.default.php
index 1374b1b96ec20a04d3b7fbc87275f1433e6a7ed9..a589924ef10f7dd2210197009833bb9508195e68 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -4,7 +4,7 @@ $GLOBALS['phorkie']['cfg'] = array(
     'gitdir'        => __DIR__ . '/../repos/git/',
     'workdir'       => __DIR__ . '/../repos/work/',
     'tpl'           => __DIR__ . '/templates/',
-    'css'           => 'http://twitter.github.com/bootstrap/assets/css/bootstrap.css',
+    'css'           => '',
     'title'         => 'phorkie',
     'topbar'        => '',
     'setupcheck'    => true,
diff --git a/data/templates/base.htm b/data/templates/base.htm
index 7cf5505faafcf76c20e5ef0c2435d02aa59b6099..d13f9e9478d47448b9e976c9a9a5fe2a255ff41c 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -3,10 +3,15 @@
 <html>
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <link rel="stylesheet" href="/css/bootstrap.min.css"/>
+  <link rel="stylesheet" href="/css/font-awesome.css">
+  <link rel="stylesheet" href="/css/phorkie.css"/>
+  {% if css %}
   <link rel="stylesheet" href="{{css}}"/>
-  <link rel="stylesheet" href="/css/phorkie.css" />
+  {% endif %}
   <title>{% block title %}{% endblock %} - {{title}}</title>
   <script src="/js/jquery.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <script src="/js/phorkie.js"></script>
   {% block meta %}{% endblock %}
  </head>
Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.