git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f74dc77)
bootstrap 2.0 support
authorChristian Weiske <cweiske@cweiske.de>
Tue, 25 Sep 2012 18:44:15 +0000 (20:44 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Tue, 25 Sep 2012 18:44:15 +0000 (20:44 +0200)
data/templates/base.htm patch | blob | history
data/templates/display-foot.htm patch | blob | history
data/templates/display-head.htm patch | blob | history
data/templates/edit-file.htm patch | blob | history
data/templates/edit.htm patch | blob | history
data/templates/fork-remote-new.htm patch | blob | history
data/templates/new.htm patch | blob | history
www/css/phorkie.css patch | blob | history

diff --git a/data/templates/base.htm b/data/templates/base.htm
index dc065662b29b37eb91c0d8f926c4d7ce20e6cbff..6cfea7f676bcca48a0e6bc7a04eb6631065d8060 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -12,7 +12,7 @@
  </head>
  <body>
   {{topbar|raw}}
  </head>
  <body>
   {{topbar|raw}}
-  <div class="navbar">
+  <div class="navbar navbar-inverse">
    <div class="navbar-inner">
     <div class="container">
      <a class="brand" href="/">
    <div class="navbar-inner">
     <div class="container">
      <a class="brand" href="/">
diff --git a/data/templates/display-foot.htm b/data/templates/display-foot.htm
index 9f2451fbd26062245e0011516a2509518fbbe754..a290962e673ffe58fa7d283b73a3925f6522350c 100644 (file)
--- a/data/templates/display-foot.htm
+++ b/data/templates/display-foot.htm
@@ -1,7 +1,7 @@
 <div class="row-fluid" style="margin-top: 5ex">
  <div class="span12" style="text-align: right;">
   <a class="btn" href="{{repo.getLink('delete')}}">
 <div class="row-fluid" style="margin-top: 5ex">
  <div class="span12" style="text-align: right;">
   <a class="btn" href="{{repo.getLink('delete')}}">
-   <i class="icon-trash"></i> Delete
+   <i class="icon-trash"></i> Delete paste
   </a>
  </div>
 </div>
   </a>
  </div>
 </div>
diff --git a/data/templates/display-head.htm b/data/templates/display-head.htm
index 0a238dcb39914f5512effb4ebf73243425412636..874aa9912b88606a5f5ca600e5b901095de3a31e 100644 (file)
--- a/data/templates/display-head.htm
+++ b/data/templates/display-head.htm
@@ -11,7 +11,7 @@
 </div>
 
 {% if repo.getCloneURL(true) or repo.getCloneURL(false) %}
 </div>
 
 {% if repo.getCloneURL(true) or repo.getCloneURL(false) %}
-<div class="well">
+<div class="urlinfo well well-small">
  {% if repo.getCloneURL(true) %}
  <div class="row-fluid">
   <div class="span3">Public clone URL</div>
  {% if repo.getCloneURL(true) %}
  <div class="row-fluid">
   <div class="span3">Public clone URL</div>
diff --git a/data/templates/edit-file.htm b/data/templates/edit-file.htm
index b84b42b37d1f0c3b7ae41ca2ae0234df4cfb2880..db0b2c5f571d422173f61c9048c2480bd0abc438 100644 (file)
--- a/data/templates/edit-file.htm
+++ b/data/templates/edit-file.htm
@@ -1,4 +1,4 @@
- <div class="well filegroup" id="filegroup{{fileid}}">
+ <div class="filegroup" id="filegroup{{fileid}}">
   {% if not file or file.isText %}
   <textarea name="files[{{fileid}}][content]" id="content_{{fileid}}" cols="80" rows="15" class="content">{{file.getContent}}</textarea>
   {% else %}
   {% if not file or file.isText %}
   <textarea name="files[{{fileid}}][content]" id="content_{{fileid}}" cols="80" rows="15" class="content">{{file.getContent}}</textarea>
   {% else %}
@@ -6,7 +6,7 @@
    Binary files cannot be edited.
   </p>
   {% endif %}
    Binary files cannot be edited.
   </p>
   {% endif %}
-  <div class="row-fluid">
+  <div class="row-fluid content-details">
    <div class="span1">
     <a class="btn additional-btn" href="#" onclick="toggleAdditional(this); return false;" style="display:none" title="Show additional options">
      <i class="icon-chevron-up"></i>
    <div class="span1">
     <a class="btn additional-btn" href="#" onclick="toggleAdditional(this); return false;" style="display:none" title="Show additional options">
      <i class="icon-chevron-up"></i>
diff --git a/data/templates/edit.htm b/data/templates/edit.htm
index 2237e10916079b3724cce56e6f8af2e87cc10ce2..1422bbcfa5606ebd5f88487a5d79fbf4c1b37c8c 100644 (file)
--- a/data/templates/edit.htm
+++ b/data/templates/edit.htm
@@ -7,7 +7,7 @@
 
 {% block content %}
 <form method="post" action="{{repo.getLink('edit')}}" enctype="multipart/form-data">
 
 {% block content %}
 <form method="post" action="{{repo.getLink('edit')}}" enctype="multipart/form-data">
- <div class="control-group well pastedata">
+ <div class="control-group pastedata">
    <label for="description">Description</label>
    <input type="text" name="description" id="description" value="{{repo.getDescription}}"/>
  </div>
    <label for="description">Description</label>
    <input type="text" name="description" id="description" value="{{repo.getDescription}}"/>
  </div>
diff --git a/data/templates/fork-remote-new.htm b/data/templates/fork-remote-new.htm
index 6b48ffe3dd8862456ae4ae288820b50e88d56ff1..9bca0cc18280d3c6c487b7072f147541a1e2161b 100644 (file)
--- a/data/templates/fork-remote-new.htm
+++ b/data/templates/fork-remote-new.htm
@@ -4,9 +4,9 @@
   Just paste the website or git clone URL.
  </p>
 
   Just paste the website or git clone URL.
  </p>
 
- <button type="submit" class="btn btn-primary" style="float: right">
+ <label for="remote-url">Remote paste URL</label>
+ <input type="text" name="remote_url" id="remote-url" value="{{remote_url}}" class="span4"/>
+ <button type="submit" class="btn btn-primary" style="float: right; display: block">
   <i class="icon-share icon-white"></i> Fork remote paste
  </button>
   <i class="icon-share icon-white"></i> Fork remote paste
  </button>
- <label for="remote-url">Remote paste URL</label>
- <input type="text" name="remote_url" id="remote-url" value="{{remote_url}}" class="span5"/>
 </form>
 </form>
diff --git a/data/templates/new.htm b/data/templates/new.htm
index bc6c762a53e34e38b7bcfba60c19a61d0a842576..7548c2ad98d66851494b491aad4628a7afc8a57b 100644 (file)
--- a/data/templates/new.htm
+++ b/data/templates/new.htm
@@ -3,13 +3,12 @@
 
 {% block content %}
 <form method="post" action="/new" enctype="multipart/form-data">
 
 {% block content %}
 <form method="post" action="/new" enctype="multipart/form-data">
- <div class="control-group well pastedata">
+ <div class="control-group pastedata">
    <label for="description">Description</label>
    <input type="text" name="description" id="description" value="{{description}}"/>
  </div>
 
  {% include 'edit-file.htm' with {'file': file[1], 'fileid': 0, 'newfile': true} %}
    <label for="description">Description</label>
    <input type="text" name="description" id="description" value="{{description}}"/>
  </div>
 
  {% include 'edit-file.htm' with {'file': file[1], 'fileid': 0, 'newfile': true} %}
-
  {% include 'edit-add.htm' %}
 
  <div class="row-fluid formbuttons">
  {% include 'edit-add.htm' %}
 
  <div class="row-fluid formbuttons">
diff --git a/www/css/phorkie.css b/www/css/phorkie.css
index c8d8dce4c10a7d6817e4ebd399379adbe7c749c8..09e833d8d2fc745266709bdd493c99fc13e88149 100644 (file)
--- a/www/css/phorkie.css
+++ b/www/css/phorkie.css
@@ -44,10 +44,17 @@ h1 {
 }
 
 .repo-info {
 }
 
 .repo-info {
-    margin-bottom: 2em;
+    margin-bottom: 2ex;
+}
+.repo-info form {
+    margin-bottom: 0px;
+}
+.urlinfo {
+    padding-bottom: 0px;
 }
 }
+
 .file .header {
 .file .header {
-    padding: 1.0ex;
+    padding: 0ex 0ex 0ex 1ex;
     margin-bottom: 1em;
     background-color: whiteSmoke;
     border: 1px solid #EEE;
     margin-bottom: 1em;
     background-color: whiteSmoke;
     border: 1px solid #EEE;
@@ -56,6 +63,10 @@ h1 {
     -moz-border-radius: 4px;
     border-radius: 4px;
 }
     -moz-border-radius: 4px;
     border-radius: 4px;
 }
+.file .header h3 {
+    margin: 0px;
+    font-size: 1.2em;
+}
 .file .header .btn-mini {
     margin-left: 2px;
 }
 .file .header .btn-mini {
     margin-left: 2px;
 }
@@ -87,10 +98,33 @@ ul.pager {
     margin-top: 2ex;
 }
 
     margin-top: 2ex;
 }
 
+.pastedata label {
+    display: block;
+    float: left;
+    width: 100px;
+    margin-top: 4px;
+}
+.pastedata input {
+    display: block;
+    margin-left: 110px;
+    width: 590px !important;
+}
+.formbuttons {
+    margin-top: 2ex;
+}
+
 form textarea.content {
     width: 100%;
     box-sizing: border-box;
     font-family: monospace;
 form textarea.content {
     width: 100%;
     box-sizing: border-box;
     font-family: monospace;
+    margin-bottom: 0px;
+    margin-top: 2ex;
+}
+.content-details {
+    margin-top: 12px;
+}
+.content-details .additional-btn {
+    margin-top: -12px;
 }
 form .allwidth {
     box-sizing: border-box;
 }
 form .allwidth {
     box-sizing: border-box;
Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.