From 31648d65c8c5c3a54fc36b83871dcc09a9ac982f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 2 Jan 2015 19:20:52 -0800
Subject: some work on the edit connection workflow explanation and connedit
 page. This needs a lot more attention, but it was screaming for any
 improvement in documenting why we tell you that the permissions have been
 changed but not saved.

---
 view/tpl/abook_edit.tpl | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index c2c11e4b1..bb20312fa 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -7,11 +7,27 @@
 <div id="connection-flag-tabs">
 {{$tabs}}
 </div>
+<div id="connection-edit-buttons">
+{{foreach $buttons as $b }}
+<button class="btn btn-sm btn-default" title="{{$b.title}}" onclick="window.location.href='{{$b.url}}'; return false;">{{$b.label}}</button>
+{{/foreach}}
 {{/if}}
 
 
-
 <div id="contact-edit-wrapper">
+<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+
+<div class="abook-permschange" style="display: none;">
+<div class="abook-perms-steps"><i class="icon-check"></i><br />{{$perms_step1}}</div>
+<div class="abook-perms-steps"><i class="icon-check-empty"></i><br />{{$perms_step2}}</div>
+<div class="abook-perms-steps"><i class="icon-check-empty"></i><br />{{$perms_step3}}</div>
+</div>
+
+<div class="abook-permssave" style="display: none;">
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+</div>
+
+
 
 {{if $last_update}}
 {{$lastupdtext}} {{$last_update}}
@@ -27,7 +43,6 @@
 {{/if}}
 
 
-<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
 
 {{if $self}}
 <div class="abook-autotext">
@@ -40,10 +55,6 @@
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-<div class="abook-permschange" style="display: none;"></div>
-<div class="abook-permssave" style="display: none;">
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-</div>
 
 
 {{if $is_pending}}
@@ -63,15 +74,6 @@
 
 <h3>{{$permlbl}}</h3>
 <div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
-
-<br />
-
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
-<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
-
-<div id="abook-advanced-panel" style="display: block;">
-
 <table>
 <tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr>
 <tr><td colspan="5"><hr /></td></tr>
-- 
cgit v1.2.3


From 0779e3ae53161843110610eba27380bfab0b2dd0 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 3 Jan 2015 13:42:05 +0100
Subject: provide some info for buttons

---
 view/tpl/attach_edit.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 82f2a7628..0147d35ba 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -6,11 +6,11 @@
 
 	<div id="attach-edit-tools-share" class="btn-group form-group">
 		{{if !$isadir}}
-		<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs">
+		<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
 			<i class="icon-paperclip jot-icons"></i>
 		</a>
 		{{/if}}
-		<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');">
+		<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
 			<i class="icon-share jot-icons"></i>
 		</button>
 	</div>
-- 
cgit v1.2.3


From 028dff44cccc27db4140ad41fc4893d6cd6ad0f0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 4 Jan 2015 00:47:44 -0800
Subject: remove hard-coded url to caterva.eu from events code.

---
 view/tpl/event_head.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 03ea833f9..830347555 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -26,7 +26,7 @@
 			},
 			loading: function(isLoading, view) {
 				if(!isLoading) {
-					$('td.fc-day').dblclick(function() { window.location.href='https://caterva.eu/events/new?start='+$(this).data('date'); });
+					$('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
 				}
 			},
 
-- 
cgit v1.2.3