aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2012-09-25 20:44:15 +0200
committerChristian Weiske <cweiske@cweiske.de>2012-09-25 20:44:15 +0200
commitee10ed828276e2677c214d5a3bd13ced4600f6c6 (patch)
tree4548322b659fbf0afc614597db94f106ae014c7b /data
parentf74dc77e409c387d46d1b6ed8e0219b5c1390515 (diff)
downloadphorkie-ee10ed828276e2677c214d5a3bd13ced4600f6c6.tar.gz
phorkie-ee10ed828276e2677c214d5a3bd13ced4600f6c6.zip
bootstrap 2.0 support
Diffstat (limited to 'data')
-rw-r--r--data/templates/base.htm2
-rw-r--r--data/templates/display-foot.htm2
-rw-r--r--data/templates/display-head.htm2
-rw-r--r--data/templates/edit-file.htm4
-rw-r--r--data/templates/edit.htm2
-rw-r--r--data/templates/fork-remote-new.htm6
-rw-r--r--data/templates/new.htm3
7 files changed, 10 insertions, 11 deletions
diff --git a/data/templates/base.htm b/data/templates/base.htm
index dc06566..6cfea7f 100644
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -12,7 +12,7 @@
</head>
<body>
{{topbar|raw}}
- <div class="navbar">
+ <div class="navbar navbar-inverse">
<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 9f2451f..a290962 100644
--- 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')}}">
- <i class="icon-trash"></i> Delete
+ <i class="icon-trash"></i> Delete paste
</a>
</div>
</div>
diff --git a/data/templates/display-head.htm b/data/templates/display-head.htm
index 0a238dc..874aa99 100644
--- 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 class="well">
+<div class="urlinfo well well-small">
{% 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 b84b42b..db0b2c5 100644
--- 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 %}
@@ -6,7 +6,7 @@
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>
diff --git a/data/templates/edit.htm b/data/templates/edit.htm
index 2237e10..1422bbc 100644
--- 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">
- <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>
diff --git a/data/templates/fork-remote-new.htm b/data/templates/fork-remote-new.htm
index 6b48ffe..9bca0cc 100644
--- 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>
- <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>
- <label for="remote-url">Remote paste URL</label>
- <input type="text" name="remote_url" id="remote-url" value="{{remote_url}}" class="span5"/>
</form>
diff --git a/data/templates/new.htm b/data/templates/new.htm
index bc6c762..7548c2a 100644
--- 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">
- <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} %}
-
{% include 'edit-add.htm' %}
<div class="row-fluid formbuttons">