From d93df86298450512853e4085f519486eea2d8468 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Mon, 5 May 2014 13:54:56 +0000
Subject: Fixed some wrapping problems when the user has set a larger font
 size. And some UI love for the file permissions page (as requested by Mike ;)
 and changed the position of the file properties link on the cloud page.

---
 view/theme/redbasic/css/style.css | 14 ++++++++++++--
 view/tpl/attach_edit.tpl          | 20 +++++++-------------
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a4373ed37..579ec9958 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -386,6 +386,7 @@ aside li {
 
 .vcard dl {
 	clear: both;
+	word-wrap:break-word;
 }
 
 .vcard-profile-edit-icon {
@@ -1011,7 +1012,7 @@ aside li {
 .profile-match-name {
 	text-align: center;
 	width: 120px;
-	height: 18px;
+	height: 1.5em;
 	overflow: hidden !important;
 }
 
@@ -1033,7 +1034,7 @@ aside li {
 	float: left;
 	padding: 10px;
 	width: 120px;
-	height: 120px;
+	min-height: auto;
 	scroll: auto;
 }
 #profile-match-wrapper-end {
@@ -2143,6 +2144,15 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	color: $nav_active_icon_colour;
 }
 
+/* Files */
+
+#attach-edit-perms {
+	margin-top: 25px;
+	margin-bottom: 20px;
+	font-weight: bold;
+	font-size: 18px;
+}
+
 /* bootstrap overrides */
 blockquote {
 	font-size: $body_font_size;
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 5d2703a2d..3a4f0dd2a 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,11 +1,13 @@
+<div id="attach-edit-backlink">< <a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div>
 
 <h1>{{$header}}</h1>
 
-<h2>{{$file.filename}}</h2>
-
-
-<div id="attach-edit-backlink"><a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div>
-
+<div id="attach-edit-perms" >
+<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+	<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+</button>
+{{$aclselect}} {{$file.filename}}
+</div>
 
 <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
 
@@ -14,7 +16,6 @@
 <input type="hidden" name="uid" value="{{$uid}}" />
 <input type="hidden" name="fileid" value="{{$file.id}}" />
 
-
 {{if $isadir}}
 <div id="attach-edit-recurse" >
   <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label>
@@ -28,13 +29,6 @@
 <div class="cut-paste-desc">{{$cpldesc}}</div>
 <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
 
-<div id="attach-edit-perms" >
-<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
-	<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
-</button>
-{{$aclselect}}
-</div>
-
 <div class="clear"></div>
 <input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
-- 
cgit v1.2.3