Reworked the options on the profile edit page. In one words: buttons. Hope you liked it. Revert or fix if not. Also reworked the channels manage page a bit, because channel names where not readable with larger fonts. Not perfect yet, but now readable and I think better aligned. Also revert/fix if not good.

This commit is contained in:
Jeroen 2014-08-06 21:49:30 +00:00
parent 47d496eee3
commit d2a7b5babe
4 changed files with 45 additions and 25 deletions

View File

@ -25,8 +25,7 @@
#selected-channel .channel-selection { #selected-channel .channel-selection {
clear: both; clear: both;
width: 120px; margin: 0 auto 0 auto;
margin: 0px auto 0px auto;
} }
.channel-selection-default { .channel-selection-default {
@ -35,9 +34,9 @@
} }
#all-channels .channel-selection { #all-channels .channel-selection {
width: 120px; width: 10em;
float: left; float: left;
margin-bottom: 15px; margin: 0 15px 15px 0;
} }
.channels-end { .channels-end {
clear: both; clear: both;
@ -49,7 +48,13 @@
} }
.channel-selection-name-link .channel-name { .channel-selection-name-link .channel-name {
width: 120px; padding-top: 10px;
height: 18px; text-align: left;
word-wrap: break-word;
overflow: hidden; overflow: hidden;
} }
.channels-notifications-wrapper {
clear: both;
padding-top: 10px;
}

View File

@ -368,13 +368,33 @@ aside li {
clear: both; clear: both;
} }
#profile-edit-links {
#profile-edit-links ul { width: $converse_width;
list-style-type: none; padding-top: 15px;
padding-bottom: 15px;
} }
#profile-edit-links li { #profile-edit-links .btn {
margin-top: 10px; margin: 0 10px 15px 0;
}
.profile-import {
vertical-align: top;
text-align: left;
}
.profile-import b {
color: $link_colour;
}
.profile-import input {
color: $font_colour;
border: none;
}
#profile-edit-drop-link {
color: #FFF;
font-weight: normal;
} }
#profile-like { #profile-like {

View File

@ -7,8 +7,8 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> <a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a>
<div class="channels-notifications-wrapper">{{if $channel.mail != 0}}<span style="color:#c60032;"><i class="icon-envelope"></i> {{$channel.mail}}</span>{{else}}<i class="icon-envelope"></i> &nbsp;{{/if}} {{if $channel.intros != 0}}<span style="color:#c60032;"><i class="icon-user"></i> {{$channel.intros}}</span>{{else}}<i class="icon-user"></i> &nbsp;{{/if}}</div>
<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
{{if $channel.mail != 0}}<span style="color:red;"><i class="icon-envelope"></i> {{$channel.mail}}</span>{{else}}<i class="icon-envelope"></i> &nbsp;{{/if}} {{if $channel.intros != 0}}<span style="color:red;"><i class="icon-user"></i> {{$channel.intros}}</span>{{else}}<i class="icon-user"></i> &nbsp;{{/if}}
</div> </div>
<div class="channel-selection-end"></div> <div class="channel-selection-end"></div>

View File

@ -5,22 +5,17 @@
<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" > <form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
<div id="profile-edit-links"> <div id="profile-edit-links">
<ul> <span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span>
<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li> <span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span>
<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> {{if ! $default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}}
{{if ! $default}}<li><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></li>{{/if}} {{if $profile_clone_link}}<span class="btn btn-default"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></span>{{/if}}
{{if $profile_clone_link}}<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>{{/if}} {{if $exportable}}<br /><span class="btn btn-default"><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></span>
{{if $exportable}}<li><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></li> <span class="btn btn-default profile-import"><b>{{$lbl_import}}</b> <input type="file" name="userfile" class="profile-import" ></span>
<li><b>{{$lbl_import}}</b> <input type="file" name="userfile" ></li>
{{/if}} {{/if}}
<li></li> {{if ! $default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}}
{{if ! $default}}<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>{{/if}}
</ul>
</div> </div>
<div id="profile-edit-links-end"></div> <div id="profile-edit-links-end"></div>