diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-26 14:20:06 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-26 14:20:06 +0100 |
| commit | 4fb9571136eaa659cfe5cdfd9185acd92be527eb (patch) | |
| tree | 282bd63e6ec54bc5230d898e272a316b857d1e97 /view/tpl | |
| parent | e70bb371d91ac14f6c22868d4fcc76208bdace02 (diff) | |
| parent | 2099ac06155cfbbfec5040b172b3d88bdf610ed2 (diff) | |
| download | volse-hubzilla-4fb9571136eaa659cfe5cdfd9185acd92be527eb.tar.gz volse-hubzilla-4fb9571136eaa659cfe5cdfd9185acd92be527eb.tar.bz2 volse-hubzilla-4fb9571136eaa659cfe5cdfd9185acd92be527eb.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/connection_template.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/lostpass.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/prep.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/rating_form.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/rmagic.tpl | 2 |
6 files changed, 11 insertions, 11 deletions
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> 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/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> |