aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2015-10-26 14:05:45 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2015-10-26 14:05:45 +0100
commit5e28b1216e1a44b60c1d1cf33d069b1043653103 (patch)
treeee06d2123028e96b4f76070da0d7afe58dc5ac37
parente858ee811b62f46ffc2f2ab655b6f1bc796ecbc0 (diff)
downloadvolse-hubzilla-5e28b1216e1a44b60c1d1cf33d069b1043653103.tar.gz
volse-hubzilla-5e28b1216e1a44b60c1d1cf33d069b1043653103.tar.bz2
volse-hubzilla-5e28b1216e1a44b60c1d1cf33d069b1043653103.zip
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.
-rw-r--r--mod/search.php4
-rwxr-xr-xview/tpl/lostpass.tpl7
-rwxr-xr-xview/tpl/myapps.tpl3
-rw-r--r--view/tpl/prep.tpl7
-rw-r--r--view/tpl/rating_form.tpl2
-rwxr-xr-xview/tpl/register.tpl16
-rwxr-xr-xview/tpl/rmagic.tpl2
7 files changed, 25 insertions, 16 deletions
diff --git a/mod/search.php b/mod/search.php
index ce8357fb9..a0085fca9 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -35,6 +35,8 @@ function search_content(&$a,$update = 0, $load = false) {
$o = '<div id="live-search"></div>' . "\r\n";
+ $o = '<div class="generic-content-wrapper-styled">' . "\r\n";
+
$o .= '<h3>' . t('Search') . '</h3>';
if(x($a->data,'search'))
@@ -212,6 +214,8 @@ function search_content(&$a,$update = 0, $load = false) {
$o .= conversation($a,$items,'search',$update,'client');
+ $o .= '</div>';
+
return $o;
}
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>