From a70e42edac9580eab7013f1fcdc5eae252a10dd1 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Mon, 29 Dec 2014 14:47:41 +0000
Subject: Remove link to hubloc status in admin panel.  This is a potentially
 useful tool, but plain doesn't work at the moment.

---
 view/tpl/admin_aside.tpl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index 2ab3edcc2..013b72d50 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -18,7 +18,6 @@
 	<li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li>
 	<li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
 	<li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
-	<li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li>
 	<li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
 </ul>
 </div>
-- 
cgit v1.2.3


From e69e59d260c311ceae4cbde3239c33d8caea4553 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Mon, 29 Dec 2014 22:07:40 +0100
Subject: Don't show current channel separately in channel manager, highlight
 it instead

---
 view/tpl/channel.tpl  | 4 +---
 view/tpl/channels.tpl | 8 --------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index c151ba8b2..af80e7b4d 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,4 +1,4 @@
-<div class="channel-selection">
+<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'>
 {{if $channel.default_links}}
 {{if $channel.default}}
 <div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div>
@@ -10,5 +10,3 @@
 <div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a>&nbsp;<a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div>
 <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
 </div>
-
-<div class="channel-selection-end"></div>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 0dec68a53..26d0e14d2 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -13,14 +13,6 @@
 {{$channel_usage_message}}
 </div>
 {{/if}}
-{{if $selected}}
-<div id="selected-channel">
-<div id="channels-selected">{{$msg_selected}}</div>
-{{include file="channel.tpl" channel=$selected}}
-</div>
-<div class="channels-end selected"></div>
-{{/if}}
-<br />
 <div id="channels-desc" class="descriptive-text">{{$desc}}</div>
 
 <div id="all-channels">
-- 
cgit v1.2.3


From f2bfdf0c76d2cce95f136b5240a6d7aa18bea8dc Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Mon, 29 Dec 2014 22:45:07 +0100
Subject: some work on cloud actionspanel and minor cleanup

---
 view/tpl/cloud_actionspanel.tpl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'view/tpl')

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>
-- 
cgit v1.2.3