some work on profile listing

This commit is contained in:
Mario Vavti 2016-03-17 12:56:55 +01:00
parent a41a05e6c0
commit 40162cd6b7
6 changed files with 66 additions and 72 deletions

View File

@ -758,21 +758,9 @@ function profiles_content(&$a) {
local_channel()); local_channel());
if(count($r)) { if(count($r)) {
$tpl_header = get_markup_template('profile_listing_header.tpl');
$o .= replace_macros($tpl_header,array(
'$header' => t('Edit/Manage Profiles'),
'$addstuff' => t('Add profile things'),
'$stuff_desc' => t('Include desirable objects in your profile'),
'$chg_photo' => t('Change profile photo'),
'$cr_new' => t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new")
));
$tpl = get_markup_template('profile_entry.tpl'); $tpl = get_markup_template('profile_entry.tpl');
foreach($r as $rr) { foreach($r as $rr) {
$o .= replace_macros($tpl, array( $profiles .= replace_macros($tpl, array(
'$photo' => $rr['thumb'], '$photo' => $rr['thumb'],
'$id' => $rr['id'], '$id' => $rr['id'],
'$alt' => t('Profile Image'), '$alt' => t('Profile Image'),
@ -782,6 +770,17 @@ function profiles_content(&$a) {
: '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>') : '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
)); ));
} }
$tpl_header = get_markup_template('profile_listing_header.tpl');
$o .= replace_macros($tpl_header,array(
'$header' => t('Edit Profiles'),
'$cr_new' => t('Create New'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
'$profiles' => $profiles
));
} }
return $o; return $o;

View File

@ -6,3 +6,26 @@
padding: 7px 10px; padding: 7px 10px;
width: 100%; width: 100%;
} }
.profile-listing-table {
display: table;
width: 100%;
}
.profile-listing-row {
display: table-row;
}
.profile-listing-cell {
display: table-cell;
}
.profile-listing-edit-link {
margin: 10px;
}
.profile-listing-photo {
width: 48px;
height: 48px;
margin: 10px 0px;
}

View File

@ -328,37 +328,6 @@ footer {
margin-bottom: 15px; margin-bottom: 15px;
} }
.profile-listing-photo-wrapper {
float: left;
}
.profile-listing-edit-buttons-wrapper {
clear: both;
}
.profile-listing-photo-edit-link {
float: left;
width: 125px;
}
.profile-listing-end {
clear: both;
}
.profile-listing-edit-buttons-wrapper img{
border: none;
margin-right: 20px;
}
.profile-listing {
margin-top: 25px;
}
.profile-listing-name {
float: left;
margin-left: 32px;
margin-top: 10px;
color: #3172BD;
font-weight: bold;
width: 200px;
}
.app-name { .app-name {
overflow: none; overflow: none;
} }

View File

@ -6,24 +6,26 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a> <a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="icon-user"></i>&nbsp;{{$profpic}}</a>
</li> </li>
{{if $is_default}} {{if $is_default}}
<li class="nav-item"> <li class="nav-item">
<a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}">{{$coverpic}}</a> <a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="icon-picture"></i>&nbsp;{{$coverpic}}</a>
</li>
{{/if}}
{{if ! $is_default}}
<li class="nav-item">
<a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="icon-pencil"></i>&nbsp;{{$editvis}}</a>
</li> </li>
{{/if}} {{/if}}
<li class="nav-item"> <li class="nav-item">
<a href="thing" id="profile-edit-thing-link" title="{{$addthing}}">{{$addthing}}</a> <a href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="icon-plus-sign"></i>&nbsp;{{$addthing}}</a>
</li> </li>
<li class="divider"></li>
<li class="nav-item"> <li class="nav-item">
<a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a> <a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
</li> </li>
{{if ! $is_default}}
<li class="nav-item">
<a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}">{{$editvis}}</a>
</li>
{{/if}}
{{if $profile_clone_link}} {{if $profile_clone_link}}
<li class="divider"></li> <li class="divider"></li>
<li class="nav-item"> <li class="nav-item">

View File

@ -1,11 +1,11 @@
<div class="generic-content-wrapper-styled"> <div class="profile-listing-row">
<div class="profile-listing" > <div class="profile-listing-cell" >
<div class="profile-listing-photo-wrapper" > <a href="profiles/{{$id}}"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> </div>
</div> <div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
<div class="profile-listing-photo-end"></div> <a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div> </div>
<div class="profile-listing-visible">{{$visible}}</div> <div class="profile-listing-cell">
</div> {{$visible}}
<div class="profile-listing-end"></div> </div>
</div> </div>

View File

@ -1,11 +1,12 @@
<div class="generic-content-wrapper-styled"> <div class="generic-content-wrapper">
<h1>{{$header}}</h1> <div class="section-title-wrapper">
<p id="profile-listing-desc" class="btn btn-default" > <a class="btn btn-success btn-xs pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="icon-plus-sign"></i>&nbsp;{{$cr_new}}</a>
<a href="profile_photo" >{{$chg_photo}}</a> <h2>{{$header}}</h2>
</p> </div>
<p id="profile-stuff-link" class="btn btn-default"> <div class="section-content-wrapper">
<a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a> <div class="profile-listing-table">
</p> {{$profiles}}
<p id="profile-listing-new-link-wrapper" class="btn btn-default" > </div>
<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> </div>
</div> </div>