diff options
| -rw-r--r-- | mod/acl.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 15 | ||||
| -rwxr-xr-x | view/tpl/login.tpl | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/mod/acl.php b/mod/acl.php index 3b737d36e..0f997c8b8 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -206,7 +206,7 @@ function acl_init(&$a){ if(count($r)) { foreach($r as $g){ - if($g['abook_their_perms'] & PERMS_W_TAGWALL) { + if(($g['abook_their_perms'] & PERMS_W_TAGWALL) && $type == 'c') { $contacts[] = array( "type" => "c", "photo" => "images/twopeople.png", diff --git a/version.inc b/version.inc index 792dc3eb5..67dbb871d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-04-11.644 +2014-04-13.645 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index edee90fe6..996118ad1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -285,13 +285,16 @@ footer { #login-extra-links { clear: both; + width: 300px; } -#register-link, -#lost-password-link { +#register-link { float: left; margin-left: 100px; } +#lost-password-link { + float: right; +} #login-standard-end { clear: both; @@ -828,15 +831,17 @@ footer { .location-label, .gender-label, .marital-label, .homepage-label { float: left; - text-align: right; display: block; - width: 65px; + width: 70px; + } .adr, .x-gender, .marital-text, .homepage-url { float: left; display: block; - margin-left: 8px; + width: 130px; + height: 18px; + overflow: hidden; } .profile-clear { diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index 3ca118590..a1952d408 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -11,12 +11,14 @@ <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> </div> + <div class="clear"></div> + {{include file="field_checkbox.tpl" field=$remember}} <div id="login-standard-end"></div> <div id="login-submit-wrapper" > - <input type="submit" name="submit" id="login-submit-button" value="{{$login}}" /> + <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" /> </div> {{foreach $hiddens as $k=>$v}} |