Properly align 'Description' field in all widths

diff --git a/data/templates/edit.htm b/data/templates/edit.htm
index 521a7c28a2d757b0d4291ccbd4a19f2f93bd725b..db1f3f57ffc2fbb9dc7a5b2dcab0aa9d24439e21 100644 (file)
--- a/data/templates/edit.htm
+++ b/data/templates/edit.htm
@@ -6,10 +6,12 @@
 {% endblock %}
 
 {% block content %}
-<form method="post" action="{{repo.getLink('edit')}}" enctype="multipart/form-data">
- <div class="control-group pastedata">
-   <label for="description">Description</label>
+<form method="post" action="{{repo.getLink('edit')}}" enctype="multipart/form-data" class="form-horizontal">
+ <div class="control-group">
+  <label class="control-label" for="description">Description</label>
+  <div class="controls">
    <input type="text" name="description" id="description" value="{{repo.getDescription}}"/>
+  </div>
  </div>
 
  {% for fileid, file in repo.getFiles %}

diff --git a/data/templates/new.htm b/data/templates/new.htm
index 4a748bff1ff8372b743c58f4374cecd9bf3e6747..295b76d8ef3ad5935efec63ab55427d9387984a1 100644 (file)
--- a/data/templates/new.htm
+++ b/data/templates/new.htm
@@ -2,10 +2,12 @@
 {% block title %}New paste{% endblock %}
 
 {% block content %}
-<form method="post" action="/new" enctype="multipart/form-data">
- <div class="control-group pastedata">
-   <label for="description">Description</label>
+<form method="post" action="/new" enctype="multipart/form-data" class="form-horizontal">
+ <div class="control-group">
+  <label class="control-label" for="description">Description</label>
+  <div class="controls">
    <input type="text" name="description" id="description" value="{{description}}"/>
+  </div>
  </div>
 
  {% include 'edit-file.htm' with {'file': file[1], 'fileid': 0, 'newfile': true} %}

diff --git a/www/css/phorkie.css b/www/css/phorkie.css
index f5de22574fd853654bba1692502855dee897f2e6..1b524f76ea530b26306922643cd9788c2ffcf16e 100644 (file)
--- a/www/css/phorkie.css
+++ b/www/css/phorkie.css
@@ -108,17 +108,6 @@ ul.pager {
     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;
 }
@@ -153,6 +142,15 @@ form label.inline {
     display: inline;
 }
 
+.form-horizontal .control-label {
+    text-align: left;
+    width: 8em;
+}
+
+.form-horizontal .controls {
+    margin-left: 8em;
+}
+
 .btn [class^="icon-"], .btn [class*=" icon-"] {
     line-height: 1.1em;
 }