Merge pull request #2099 from rabuzarus/2611_new_user_addr
generate addr for new registered users
This commit is contained in:
commit
3b6d3d1ade
15 changed files with 89 additions and 68 deletions
|
@ -463,7 +463,7 @@ a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
blockquote {
|
||||
background: #FFFFFF;
|
||||
background: #ffffff;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
border-left: 1em solid #e6e6e6;
|
||||
|
@ -810,6 +810,9 @@ aside .vcard .fn {
|
|||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .p-faddr {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
|
|
|
@ -463,7 +463,7 @@ a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
blockquote {
|
||||
background: #FFFFFF;
|
||||
background: #ffffff;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
border-left: 1em solid #e6e6e6;
|
||||
|
@ -810,6 +810,9 @@ aside .vcard .fn {
|
|||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .p-faddr {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
|
|
|
@ -420,7 +420,7 @@
|
|||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
font-size: 11px;
|
||||
background-color: #F6ECF9;
|
||||
background-color: #f6ecf9;
|
||||
color: #2d2d2d;
|
||||
margin: 50px 0px 0px 0px;
|
||||
display: table;
|
||||
|
@ -463,7 +463,7 @@ a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
blockquote {
|
||||
background: #FFFFFF;
|
||||
background: #ffffff;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
border-left: 1em solid #e6e6e6;
|
||||
|
@ -810,6 +810,9 @@ aside .vcard .fn {
|
|||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .p-faddr {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
|
@ -1704,7 +1707,7 @@ span[id^="showmore-wrap"] {
|
|||
height: 20px;
|
||||
width: 500px;
|
||||
font-weight: bold;
|
||||
border: 1px solid #F6ECF9;
|
||||
border: 1px solid #f6ecf9;
|
||||
}
|
||||
#jot #jot-title:-webkit-input-placeholder {
|
||||
font-weight: normal;
|
||||
|
@ -1731,7 +1734,7 @@ span[id^="showmore-wrap"] {
|
|||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 200px;
|
||||
border: 1px solid #F6ECF9;
|
||||
border: 1px solid #f6ecf9;
|
||||
}
|
||||
#jot #jot-category:hover {
|
||||
border: 1px solid #999999;
|
||||
|
|
|
@ -317,6 +317,7 @@ aside {
|
|||
.vcard {
|
||||
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
|
||||
.title { margin-bottom: 5px; }
|
||||
.p-faddr{ margin-bottom: 5px; }
|
||||
dl { height: auto; overflow: auto; }
|
||||
dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
|
||||
dd {float: left; margin-left: 4px; width: 60%;}
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
<div class="action">
|
||||
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
|
||||
<ul id="profiles-menu" class="menu-popup">
|
||||
{{if $profile.menu.entries}}
|
||||
{{foreach $profile.menu.entries as $e}}
|
||||
<li>
|
||||
<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
{{else}}
|
||||
<li>
|
||||
<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $profile.menu.entries}}
|
||||
{{foreach $profile.menu.entries as $e}}
|
||||
<li>
|
||||
<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
{{else}}
|
||||
<li>
|
||||
<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
|
||||
{{if $profile.menu.cr_new }}
|
||||
<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
|
||||
|
@ -26,6 +26,7 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
|
||||
|
||||
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
|
||||
|
@ -52,21 +53,23 @@
|
|||
|
||||
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
|
||||
|
||||
{{if $homepage}}<dl class="homepage"><dt
|
||||
class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a
|
||||
href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
|
||||
{{if $homepage}}
|
||||
<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
|
||||
<dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{include file="diaspora_vcard.tpl"}}
|
||||
|
||||
<div id="profile-extra-links">
|
||||
<ul>
|
||||
{{if $connect}}
|
||||
{{if $remoteconnect}}
|
||||
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
|
||||
{{else}}
|
||||
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
{{if $remoteconnect}}
|
||||
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
|
||||
{{else}}
|
||||
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
{{if $wallmessage}}
|
||||
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
||||
{{/if}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue