diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/mood_content.tpl | 25 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard_short.tpl | 42 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/zcard.tpl | 37 |
6 files changed, 95 insertions, 23 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 0e65dfa69..54f625e0b 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -68,7 +68,6 @@ {{include file="field_input.tpl" field=$maximagesize}} <h3>{{$corporate}}</h3> - {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$verify_email}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl index 63eaa2d8d..4059620ce 100755 --- a/view/tpl/mood_content.tpl +++ b/view/tpl/mood_content.tpl @@ -1,6 +1,15 @@ -<h3>{{$title}}</h3> -<div id="mood-desc">{{$desc}}</div> +<div id="mood-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + + <div id="mood-desc">{{$desc}}</div> + +<br /> +<br /> + <form action="mood" method="get"> <br /> @@ -8,11 +17,13 @@ <input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> -<select name="verb" id="mood-verb-select" > -{{foreach $verbs as $v}} -<option value="{{$v.0}}">{{$v.1}}</option> -{{/foreach}} -</select> +<div class="form-group field custom"> + <select name="verb" id="mood-verb-select" class="form-control" > + {{foreach $verbs as $v}} + <option value="{{$v.0}}">{{$v.1}}</option> + {{/foreach}} + </select> +</div> <br /> <br /> <input type="submit" name="submit" value="{{$submit}}" /> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 5857ae5d1..56c262564 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,8 +1,11 @@ <div class="vcard"> + {{if ! $zcard}} <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> + {{/if}} {{if $connect}} <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> {{/if}} + {{if ! $zcard}} {{if $profile.edit}} <div class="dropdown"> <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> @@ -17,9 +20,12 @@ </ul> </div> {{/if}} + {{/if}} + {{if ! $zcard}} <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} + {{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl new file mode 100755 index 000000000..91102306c --- /dev/null +++ b/view/tpl/profile_vcard_short.tpl @@ -0,0 +1,42 @@ +{{$contact_block}} + + {{if $connect}} + <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> + {{/if}} + + +{{$rating}} + + {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} + + {{if $location}} + <dl class="location"><dt class="location-label">{{$location}}</dt> + <dd class="adr"> + {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}} + <span class="city-state-zip"> + <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}} + <span class="region">{{$profile.region}}</span> + <span class="postal-code">{{$profile.postal_code}}</span> + </span> + {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}} + </dd> + </dl> + {{/if}} + + {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}} + + + {{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">{{$profile.homepage}}</dd></dl>{{/if}} + + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} + +<div id="clear"></div> + +{{$chanmenu}} + + + diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index af5f222fe..820ffd711 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -42,8 +42,12 @@ </div> <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> <div class="section-content-tools-wrapper"> + {{if $server_role != 'basic'}} {{include file="field_select_grouped.tpl" field=$role}} - <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> + {{/if}} + <div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};"> + + {{if $server_role != 'basic'}} <div class="form-group"> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </div> @@ -65,6 +69,7 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> + {{/if}} <div id="settings-default-perms" class="form-group" > <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i> {{$permissions}}</button> {{$aclselect}} diff --git a/view/tpl/zcard.tpl b/view/tpl/zcard.tpl index b73b1011c..908f07631 100644 --- a/view/tpl/zcard.tpl +++ b/view/tpl/zcard.tpl @@ -41,41 +41,50 @@ } {{elseif $size == 'hz_medium'}} .hz_card { - -moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); - transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); +/* -moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); + transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */ font-family: sans-serif, arial, freesans; + width: 100%; + overflow: hidden; + height: 390px; } -.hz_cover_photo { - max-width: 100%; +.hz_cover_photo img { + width: {{$maxwidth}}px; +/* max-width: 100%; */ } .hz_profile_photo { position: relative; - top: -300px; + top: -165px; left: 30px; + + width: 150px; + height: 150px; +} +.hz_profile_photo img { background-color: white; border: 1px solid #ddd; border-radius: 5px; -moz-border-radius: 5px; - padding: 10px; - width: 320px; - height: 320px; + padding: 5px; + width: 150px; + height: 150px; } .hz_name { position: relative; top: -100px; - left: 400px; + left: 210px; color: #fff; - font-size: 48px; + font-size: 32px; text-rendering: optimizelegibility; text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); } .hz_addr { position: relative; - top: -110px; - left: 400px; + top: -100px; + left: 210px; color: #fff; - font-size: 24px; + font-size: 18px; text-rendering: optimizelegibility; text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); } @@ -130,6 +139,6 @@ <div class="hz_name">{{$zcard.chan.xchan_name}}</div> <div class="hz_addr">{{$zcard.chan.channel_addr}}</div> </div> - <div class="hz_profile_photo"><img style="width: {{$pphoto.width}}px; height: {{$pphoto.height}}px;" src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div> + <div class="hz_profile_photo"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div> </div> |