aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorJeroen <jeroenpraat@xs4all.nl>2014-08-06 21:49:30 +0000
committerJeroen <jeroenpraat@xs4all.nl>2014-08-06 21:49:30 +0000
commitd2a7b5babef88fc92212ad071daaf73461b35c90 (patch)
treef79dba148a4f522c32ab2e711cc5574d1c4e1b65 /view
parent47d496eee3a5cd8c5da212945c31cc2eb05b6416 (diff)
downloadvolse-hubzilla-d2a7b5babef88fc92212ad071daaf73461b35c90.tar.gz
volse-hubzilla-d2a7b5babef88fc92212ad071daaf73461b35c90.tar.bz2
volse-hubzilla-d2a7b5babef88fc92212ad071daaf73461b35c90.zip
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.
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_manage.css19
-rw-r--r--view/theme/redbasic/css/style.css28
-rwxr-xr-xview/tpl/channel.tpl2
-rwxr-xr-xview/tpl/profile_edit.tpl19
4 files changed, 44 insertions, 24 deletions
diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 5813214d7..159707e40 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -25,8 +25,7 @@
#selected-channel .channel-selection {
clear: both;
- width: 120px;
- margin: 0px auto 0px auto;
+ margin: 0 auto 0 auto;
}
.channel-selection-default {
@@ -35,9 +34,9 @@
}
#all-channels .channel-selection {
- width: 120px;
+ width: 10em;
float: left;
- margin-bottom: 15px;
+ margin: 0 15px 15px 0;
}
.channels-end {
clear: both;
@@ -49,7 +48,13 @@
}
.channel-selection-name-link .channel-name {
- width: 120px;
- height: 18px;
+ padding-top: 10px;
+ text-align: left;
+ word-wrap: break-word;
overflow: hidden;
-} \ No newline at end of file
+}
+
+.channels-notifications-wrapper {
+ clear: both;
+ padding-top: 10px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 92ec48b77..15c0ae8a5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -368,13 +368,33 @@ aside li {
clear: both;
}
+#profile-edit-links {
+ width: $converse_width;
+ padding-top: 15px;
+ padding-bottom: 15px;
+}
-#profile-edit-links ul {
- list-style-type: none;
+#profile-edit-links .btn {
+ margin: 0 10px 15px 0;
}
-#profile-edit-links li {
- margin-top: 10px;
+.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 {
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index a20cf0e6a..55b122d9b 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -7,8 +7,8 @@
{{/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>
+<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>
-{{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 class="channel-selection-end"></div>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index afd24185c..b007d54ca 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -5,22 +5,17 @@
<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
<div id="profile-edit-links">
-<ul>
-<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
-<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-{{if ! $default}}<li><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></li>{{/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}}<li><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></li>
-<li><b>{{$lbl_import}}</b> <input type="file" name="userfile" ></li>
+<span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span>
+<span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span>
+{{if ! $default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/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 $exportable}}<br /><span class="btn btn-default"><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></span>
+<span class="btn btn-default profile-import"><b>{{$lbl_import}}</b> <input type="file" name="userfile" class="profile-import" ></span>
{{/if}}
-<li></li>
-{{if ! $default}}<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>{{/if}}
-
-</ul>
+{{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}}
</div>
-
<div id="profile-edit-links-end"></div>