From 97e1a6dfde7d8d8e23d463ab22f24011cbce0d8c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 22 Mar 2016 02:06:19 +0100 Subject: whip mod manage into shape --- mod/manage.php | 11 +++------ view/css/mod_manage.css | 65 ++++++++++++++++--------------------------------- view/tpl/channel.tpl | 59 +++++++++++++++++++++++++++++++++++--------- view/tpl/channels.tpl | 60 +++++++++++++++++---------------------------- 4 files changed, 95 insertions(+), 100 deletions(-) diff --git a/mod/manage.php b/mod/manage.php index 671003efd..1f7c26cd8 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -134,9 +134,7 @@ function manage_content(&$a) { } } - $links = array( - array( 'new_channel', t('Create a new channel'), t('Create a new channel')) - ); + $create = array( 'new_channel', t('Create a new channel'), t('Create New')); $delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_their_perms & %d) > 0", @@ -156,8 +154,6 @@ function manage_content(&$a) { $delegates = null; } - - $o = replace_macros(get_markup_template('channels.tpl'), array( '$header' => t('Channel Manager'), '$msg_selected' => t('Current Channel'), @@ -165,17 +161,16 @@ function manage_content(&$a) { '$desc' => t('Switch to one of your channels by selecting it.'), '$msg_default' => t('Default Channel'), '$msg_make_default' => t('Make Default'), - '$links' => $links, + '$create' => $create, '$all_channels' => $channels, '$mail_format' => t('%d new messages'), '$intros_format' => t('%d new introductions'), '$channel_usage_message' => $channel_usage_message, - '$delegate_header' => t('Delegated Channels'), + '$delegated_desc' => t('Delegated Channel'), '$delegates' => $delegates, )); - return $o; } diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css index fbe4a672a..077b6b838 100644 --- a/view/css/mod_manage.css +++ b/view/css/mod_manage.css @@ -1,57 +1,34 @@ -#channels-selected { - color: #666666; - font-size: 0.8em; +.make-default-link, +.make-default-link:hover { + color: inherit; + text-decoration: none; } -#channels-desc { - color: #666666; - font-size: 1.2em; - margin-top: 15px; - margin-bottom: 20px; -} - -.channels-break { - margin-bottom: 15px; -} - -.channel-selection-default { - font-size: 0.8em; - margin-bottom: 10px; +.new-notification { + color: #c60032; } -.channel-selection { - width: 12em; - height: 16em; - float: left; - text-align: center; +.channel-photo-wrapper { + display: table-cell; + table-layout: fixed; + vertical-align: top; } -.channel-selection img { - display: block; - margin-left: auto; - margin-right: auto; +.channel-photo-wrapper img { + border-radius: 4px; } -.channel-selection-name-link { - font-size: 1.2em; - margin-top: 10px; +.channel-notifications-wrapper { + display: table-cell; + table-layout: fixed; + vertical-align: top; + padding-left: 10px; } -.channel-selection-name-link .channel-name { - padding-top: 10px; - word-wrap: break-word; - overflow: hidden; +.selected-channel { + color: green; } -.channels-notifications-wrapper { - clear: both; - padding-top: 10px; -} - -.selected-channel img { - border: 2px solid #ff0000; +#all-channels-end { + margin-bottom: 20px; } - -.channels-end { - clear: both; -} \ No newline at end of file diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 23f1e0dd4..d306f0aa0 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,12 +1,49 @@ -
-{{if $channel.default_links}} -{{if $channel.default}} -
{{$msg_default}}
-{{else}} -
-{{/if}} -{{/if}} -{{$channel.channel_name}} -
{{if $channel.delegate}}{{else}} {{$channel.mail}}  {{$channel.intros}}{{/if}}
-
{{$channel.channel_name}}
 +
+
+ {{if $channel.default_links}} + {{if $channel.default}} +
+  {{$msg_default}} +
+ {{else}} + +  {{$msg_make_default}} + + {{/if}} + {{/if}} + {{if $channel.delegate}} + {{$delegated_desc}} + {{/if}} +
+

+ {{if $selected == $channel.channel_id}} + + {{/if}} + {{if $channel.delegate}} + + {{/if}} + {{if $selected != $channel.channel_id}}{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}{{/if}} +

+
+
+
+
+ {{if $selected != $channel.channel_id}}{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}{{/if}} +
+
+ {{if !$channel.delegate}} +
+ + {{if $channel.mail != 0}}{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}{{/if}} +
+
+ + {{if $channel.intros != 0}}{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}{{/if}} +
+ {{/if}} +
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 44daa0a3e..be9017bff 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,38 +1,24 @@ -
-

{{$header}}

- -{{if $links}} -{{foreach $links as $l}} -{{$l.2}} -{{/foreach}} -{{/if}} -
- -{{if $channel_usage_message}} -
-{{$channel_usage_message}} -
-{{/if}} -
{{$desc}}
- -
-{{foreach $all_channels as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -
- -
- -{{if $delegates}} -
-

{{$delegate_header}}

-
-{{foreach $delegates as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -
- -
-{{/if}} - +
+
+ {{$create.2}} +

{{$header}}

+
+
+ {{if $channel_usage_message}} +
+ {{$channel_usage_message}} +
+ {{/if}} +
+ {{$desc}} +
+ {{foreach $all_channels as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{if $delegates}} + {{foreach $delegates as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{/if}} +
-- cgit v1.2.3