some work on cloud actionspanel and minor cleanup

5 files changed, 15 insertions, 30 deletions

diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 822047c9d..7cbcc8807 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -2,7 +2,10 @@
 #files-upload-tools,
 [id^="perms-panel-"] {
 	display: none;
-	padding: 3px 10px 3px 10px !important;
+}
+
+[id^="perms-panel-"] {
+	padding: 3px 10px 0px 10px !important;
 }
 
 #attach-code,
@@ -33,3 +36,7 @@
 .cloud-index-tool {
 	padding: 7px 10px;
 }
+
+#files-upload {
+    padding: 2px;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 34bac51e9..6fefad8e4 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,6 +25,5 @@
 }
 
 #photos-upload-choose {
-	border: unset;
-	padding: unset;
+	padding: 2px;
 }
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 8b7706f16..0a64f8102 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -3,16 +3,6 @@ var ispublic = aStr['everybody'];
 
 $(document).ready(function() {
 
-	$("a#photos-upload-perms-menu").colorbox({
-		'inline' : true, 
-		'transition' : 'elastic' 
-	});
-
-	$("a#settings-default-perms-menu").colorbox({ 
-		'inline' : true, 
-		'transition' : 'elastic' 
-	});
-
 	var a;
 	a = $("#photo-edit-newtag").autocomplete({ 
 		serviceUrl: baseurl + '/acl',
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 357718623..b778c43b5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -689,18 +689,6 @@ footer {
   overflow: hidden;
 }
 
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
-	color: #8888FF;
-	text-decoration: none;
-	cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-	text-decoration: underline;
-	cursor: pointer;
-}
-
 #photo-view-wrapper {
 	background-color: $item_colour;
 }
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index d88bc94c4..0e621e9db 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -2,16 +2,17 @@
 	<label for="files-mkdir">{{$folder_header}}</label>
 	<form method="post" action="">
 		<input type="hidden" name="sabreAction" value="mkcol">
-		<input id="files-mkdir" type="text" name="name">
-		<input type="submit" value="{{$folder_submit}}">
+		<input id="files-mkdir" type="text" name="name" class="form-control form-group">
+		<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
 	</form>
+	<div class="clear"></div>
 </div>
 <div id="files-upload-tools" class="section-content-tools-wrapper form-group">
-	<label for="files-upload">{{$upload_header}}</label>
 	<form method="post" action="" enctype="multipart/form-data">
 		<input type="hidden" name="sabreAction" value="put">
-		<input id="files-upload" type="file" name="file" style="display: inline;">
-		<input type="submit" value="{{$upload_submit}}">
+		<input class="pull-left" id="files-upload" type="file" name="file">
+		<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
 		<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
 	</form>
+	<div class="clear"></div>
 </div>