changeset 6743:3a65e48d81fe

templates: make gist edit and new page look more similar - remove gravatar from edit page - add no-padding to edit page - use the same order and alignment of the mimetype and filename elements on both pages
author domruf <dominikruf@gmail.com>
date Tue, 27 Jun 2017 22:32:20 +0200
parents b89511f1aa24
children 2e306e71aa21
files kallithea/public/css/style.css kallithea/templates/admin/gists/edit.html kallithea/templates/admin/gists/new.html
diffstat 3 files changed, 4 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Tue Jun 27 22:16:27 2017 +0200
+++ b/kallithea/public/css/style.css	Tue Jun 27 22:32:20 2017 +0200
@@ -3274,17 +3274,6 @@
     clear: both;
 }
 
-select.pull-right-auto-width {
-    float: right;
-    width: auto;
-}
-
-span.expand-available {
-    display: block;
-    overflow: hidden;
-    padding-right: 15px;
-}
-
 #content div.panel .changelog-panel > .changelog-heading,
 #content div.panel .changelog-panel > ul.pagination {
     margin-left: 100px;
--- a/kallithea/templates/admin/gists/edit.html	Tue Jun 27 22:16:27 2017 +0200
+++ b/kallithea/templates/admin/gists/edit.html	Tue Jun 27 22:32:20 2017 +0200
@@ -45,7 +45,6 @@
         <div id="files_data">
           ${h.form(h.url('edit_gist', gist_id=c.gist.gist_access_id), method='post', id='eform')}
             <div>
-                ${h.gravatar_div(request.authuser.email, size=32)}
                 <input type="hidden" value="${c.file_changeset.raw_id}" name="parent_hash">
                 <textarea class="form-control commit-message"
                           id="description" name="description"
@@ -72,7 +71,7 @@
                         <input class="form-control" id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${h.safe_unicode(file.path)}">
                         <select class="form-control" id="mimetype_${h.FID('f',file.path)}" name="mimetypes"></select>
                     </div>
-                    <div class="panel-body">
+                    <div class="panel-body no-padding">
                         <div id="editor_container">
                             <textarea id="editor_${h.FID('f',file.path)}" name="contents" style="display:none">${file.content}</textarea>
                         </div>
--- a/kallithea/templates/admin/gists/new.html	Tue Jun 27 22:16:27 2017 +0200
+++ b/kallithea/templates/admin/gists/new.html	Tue Jun 27 22:32:20 2017 +0200
@@ -40,12 +40,10 @@
                     </label>
                 </div>
             </div>
-            <div id="body" class="panel panel-default">
+            <div id="body" class="panel panel-default form-inline">
                 <div class="panel-heading">
-                    <select class="form-control pull-right-auto-width" id="mimetype" name="mimetype"></select>
-                    <span class="expand-available">
-                      ${h.text('filename', size=30, placeholder=_('Name this gist ...'), class_='form-control auto-width')}
-                    </span>
+                    ${h.text('filename', size=30, placeholder=_('Name this gist ...'), class_='form-control')}
+                    <select class="form-control" id="mimetype" name="mimetype"></select>
                 </div>
                 <div class="panel-body no-padding">
                         <textarea id="editor" name="content"></textarea>