git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 907069e)
use twitter bootstrap for layouting
authorChristian Weiske <cweiske@cweiske.de>
Tue, 27 Mar 2012 19:44:13 +0000 (21:44 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Tue, 27 Mar 2012 19:44:13 +0000 (21:44 +0200)
.gitignore patch | blob | history
data/config.default.php patch | blob | history
data/config.php.dist patch | blob | history
data/templates/base.htm patch | blob | history
data/templates/display.htm patch | blob | history
data/templates/list.htm patch | blob | history
www/phorkie.css patch | blob | history
www/www-header.php patch | blob | history

diff --git a/.gitignore b/.gitignore
index f82ddfd5f5692c391a41a1b5c8db6bef6a8e799e..094fc2676d9700df3d6c12d8c2ca2539097a22d1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 README.html
 repos
+data/config.php
diff --git a/data/config.default.php b/data/config.default.php
index ec686222284ed491b02fbe6135db18fda3ff2a26..ab5c4747dddd207449cb125e83d8d693dd6cdc18 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -2,5 +2,6 @@
 $GLOBALS['phorkie']['cfg'] = array(
     'repos' => __DIR__ . '/../repos/',
     'tpl'   => __DIR__ . '/templates/',
+    'css'   => 'http://twitter.github.com/bootstrap/assets/css/bootstrap.css',
 );
 ?>
\ No newline at end of file
diff --git a/data/config.php.dist b/data/config.php.dist
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b213e85af7db1f464234a78cca29220093624416 100644 (file)
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -0,0 +1,3 @@
+<?php
+//$GLOBALS['phorkie']['cfg']['repos'] = '/var/data/phorkie/';
+?>
diff --git a/data/templates/base.htm b/data/templates/base.htm
index d0c3cee0b3661969306f1f4f276cd57272d6f561..aaf61da6745de79c5e333e6ecdd4eecbadfc6f00 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -1,17 +1,43 @@
 <!DOCTYPE html>
 <html>
  <head>
+  <link rel="stylesheet" href="{{css}}"/>
   <link rel="stylesheet" href="phorkie.css" />
   <title>{% block title %}{% endblock %} - Phorkie</title>
  </head>
  <body>
-  <nav>
-   <ul>
-    <a href="/">New paste</a>
-    <a href="/list">List all</a>
-    <a href="/search">Search</a>
-   </ul>
-  </nav>
-  <article>{% block content %}{% endblock %}</article>
+  <div class="navbar">
+   <div class="navbar-inner">
+    <div class="container">
+     <a class="brand" href="/">
+      Phorkie
+     </a>
+     <ul class="nav">
+      <li>
+       <a href="/">New paste</a>
+      </li>
+      <li>
+       <a href="/list">List all</a>
+      </li>
+      <li>
+       <form class="navbar-search pull-left" action="/search" method="get">
+        <input type="text" class="search-query" name="q" placeholder="Search"/>
+       </form>
+      </li>
+     </ul>
+    </div>
+   </div>
+  </div>
+
+  <div class="container-fluid">
+   <div class="row">
+    <div class="span9">
+     {% block content %}{% endblock %}
+    </div>
+    <div class="span3">
+     {% block sidebar %}{% endblock %}
+    </div>
+   </div>
+  </div>
  </body>
 </html>
\ No newline at end of file
diff --git a/data/templates/display.htm b/data/templates/display.htm
index afdc75c72b55ebb3c8aef351fa98fe421b88143d..cabff593b883e602ecba6d7abb0c50d54408687b 100644 (file)
--- a/data/templates/display.htm
+++ b/data/templates/display.htm
@@ -3,17 +3,28 @@
 
 {% block content %}
 <h1>{{repo.getDescription}}</h1>
-<ul class="links">
- <li><a href="{{repo.getLink('edit')}}">edit</a></li>
- <li><a href="{{repo.getLink('fork')}}">fork</a></li>
-</ul>
+<div class="row-fluid">
+ <div class="span6">
+  <a class="btn" href="{{repo.getLink('edit')}}"><i class="icon-edit"></i> edit</a>
+ </div>
+ <div class="span6" style="text-align: right">
+  <a class="btn" href="{{repo.getLink('fork')}}"><i class="icon-share"></i> fork</a>
+ </div>
+</div>
+
 {% for file in repo.getFiles %}
-<div>
- <h2 id="{{file.getFilename}}">{{file.getFilename}}<a class="anchorlink" href="#{{file.getFilename}}"></a></h2>
- <p>
-  <a href="{{file.getLink('raw')}}">raw</a>
- </p>
- {{file.getHighlightedContent|raw}}
+<div class="file">
+ <div class="header">
+  <a class="btn btn-mini" href="{{file.getLink('raw')}}" style="float: right;">raw</a>
+  <h3 id="{{file.getFilename}}">{{file.getFilename}}<a class="anchorlink" href="#{{file.getFilename}}"></a></h3>
+ </div>
+ <div class="code">
+  {{file.getHighlightedContent|raw}}
+ </div>
 </div>
 {% endfor %}
 {% endblock %}
+
+{% block sidebar %}
+sidebar FIXME
+{% endblock %}
\ No newline at end of file
diff --git a/data/templates/list.htm b/data/templates/list.htm
index 5142a7bf40db7e8c0c4a5107d5a1823bb3c7b586..ea71bd65fdea92686b201dfeb911d88ac326daf1 100644 (file)
--- a/data/templates/list.htm
+++ b/data/templates/list.htm
@@ -12,13 +12,21 @@
 </ul>
 <ul class="pager">
  {% if links.prev %}
- <li class="prev">
-  <a href="{{links.prev}}">prev</a>
+ <li class="previous">
+  <a href="{{links.prev}}">&larr; prev</a>
+ </li>
+ {% else %}
+ <li class="previous disabled">
+  <a href="#">&larr; prev</a>
  </li>
  {% endif %}
  {% if links.next %}
  <li class="next">
-  <a href="{{links.next}}">next</a>
+  <a href="{{links.next}}">next &rarr;</a>
+ </li>
+ {% else %}
+ <li class="next disabled">
+  <a href="#">next &rarr;</a>
  </li>
  {% endif %}
 </ul>
diff --git a/www/phorkie.css b/www/phorkie.css
index d6d1173f9cbe357c9501931e70dd4515f8521134..fe41780e3720aedc535dccf2252aa851e41cf742 100644 (file)
--- a/www/phorkie.css
+++ b/www/phorkie.css
@@ -1,4 +1,9 @@
 /* show IDs for anchors */
+a.anchorlink:before {
+    font-size: smaller;
+    content: '_';
+    color: transparent;
+}
 h1[id]:hover a.anchorlink:before,
 h2[id]:hover a.anchorlink:before,
 h3[id]:hover a.anchorlink:before,
@@ -14,3 +19,26 @@ a.anchorlink {
     margin-left: 0.5em;
     font-size: smaller;
 }
+.navbar .brand {
+    /*float: right;*/
+    color: yellow;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, .1), 0 0 30px rgba(255, 255, 255, .125);
+}
+
+.file {
+    margin-top: 2em;
+
+}
+.file .header {
+    padding: 1.0ex;
+    margin-bottom: 1em;
+    background-color: whiteSmoke;
+    border: 1px solid #EEE;
+    border: 1px solid rgba(0, 0, 0, 0.05);
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+.file .code {
+    margin-left: 2em;
+}
\ No newline at end of file
diff --git a/www/www-header.php b/www/www-header.php
index 5b2fa565be7013ef339583b0f7dd2568980f3154..01214d7e1af7ec307359538ef8ee1e262961b488 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -45,6 +45,7 @@ $twig = new \Twig_Environment(
 
 function render($tplname, $vars)
 {
+    $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);
 }
Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.