From e858ee811b62f46ffc2f2ab655b6f1bc796ecbc0 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Mon, 26 Oct 2015 13:57:12 +0100
Subject: Fixed connection page. Page was overcrowded on systems with larger
 fonts.

---
 view/tpl/connection_template.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl')

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 47f01ef5d..35e97f3e9 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -4,6 +4,7 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 	<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
+	<div class="contact-entry-name-end" ></div>
 	<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div>
 	<div class="contact-entry-end" ></div>
 </div>
-- 
cgit v1.2.3


From 5e28b1216e1a44b60c1d1cf33d069b1043653103 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Mon, 26 Oct 2015 14:05:45 +0100
Subject: Added a few generic-content-wrapper-styled classes and a button
 position fixed for lostpass. mod/search probably needs a .tpl in the future,
 but I don't know how to that.

---
 view/tpl/lostpass.tpl    |  7 +++----
 view/tpl/myapps.tpl      |  3 ++-
 view/tpl/prep.tpl        |  7 ++-----
 view/tpl/rating_form.tpl |  2 +-
 view/tpl/register.tpl    | 16 +++++++++++-----
 view/tpl/rmagic.tpl      |  2 ++
 6 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
index f6fdb28d7..8ecfd215b 100755
--- a/view/tpl/lostpass.tpl
+++ b/view/tpl/lostpass.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
@@ -8,11 +9,9 @@
 <div id="login-name-wrapper">
         <label for="login-name" id="label-login-name">{{$name}}</label>
         <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
 <div id="login-submit-end"></div>
 </form>
-
+</div>
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index ccb995849..32d544a86 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -1,7 +1,8 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 {{foreach $apps as $ap}}
 {{$ap}}
 {{/foreach}}
 <div class="clear"></div>
-
+</div>
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl
index 7bef7a417..debba13a8 100644
--- a/view/tpl/prep.tpl
+++ b/view/tpl/prep.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$header}}</h1>
 
 {{if $site}}
@@ -27,8 +28,4 @@
 </div>
 {{/foreach}}
 {{/if}}
-
-
-
-
-
+</div>
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
index 95c2eb03f..d072a0b3c 100644
--- a/view/tpl/rating_form.tpl
+++ b/view/tpl/rating_form.tpl
@@ -19,4 +19,4 @@
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
-</form>
\ No newline at end of file
+</form>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index ed673031a..4a9a6ce03 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,8 +1,8 @@
+<link href="custom/css/loginreg.css" rel="stylesheet">
+<div class="reg-box">
 <h2>{{$title}}</h2>
 
-<form action="register" method="post" id="register-form">
-
-
+<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
 
 {{if $reg_is}}
 <div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
@@ -12,6 +12,11 @@
 {{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
 {{/if}}
 
+</div>
+<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+
+<form action="register" method="post" id="register-form"  >
+
 {{if $invitations}}
 	<p id="register-invite-desc">{{$invite_desc}}</p>
 
@@ -45,7 +50,8 @@
 	<input type="hidden" name="tos" value="1" />
 	{{/if}}
 
-	<input type="submit" name="submit" class="btn btn-default" id="register-submit-button" value="{{$submit}}" />
+	<button type="submit" name="submit" class="btn btn-default btn-lg" id="register-submit-button">{{$submit}}</button>
 	<div id="register-submit-end" class="register-field-end"></div>
-
 </form>
+</div>
+</div>
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index 58df71718..d0f7aab64 100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 <form action="rmagic" method="post" >
@@ -9,3 +10,4 @@
 	<div id="rmagic-submit-end" class="rmagic-field-end"></div>
 
 </form>
+</div>
-- 
cgit v1.2.3


From 2099ac06155cfbbfec5040b172b3d88bdf610ed2 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Mon, 26 Oct 2015 14:16:05 +0100
Subject: Revert this one. This was hub specific.

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

(limited to 'view/tpl')

diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 4a9a6ce03..ed673031a 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,8 +1,8 @@
-<link href="custom/css/loginreg.css" rel="stylesheet">
-<div class="reg-box">
 <h2>{{$title}}</h2>
 
-<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+<form action="register" method="post" id="register-form">
+
+
 
 {{if $reg_is}}
 <div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
@@ -12,11 +12,6 @@
 {{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
 {{/if}}
 
-</div>
-<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
-
-<form action="register" method="post" id="register-form"  >
-
 {{if $invitations}}
 	<p id="register-invite-desc">{{$invite_desc}}</p>
 
@@ -50,8 +45,7 @@
 	<input type="hidden" name="tos" value="1" />
 	{{/if}}
 
-	<button type="submit" name="submit" class="btn btn-default btn-lg" id="register-submit-button">{{$submit}}</button>
+	<input type="submit" name="submit" class="btn btn-default" id="register-submit-button" value="{{$submit}}" />
 	<div id="register-submit-end" class="register-field-end"></div>
+
 </form>
-</div>
-</div>
-- 
cgit v1.2.3