diff --git a/boot.php b/boot.php index 3f821ec5..8b25dff4 100644 --- a/boot.php +++ b/boot.php @@ -1174,11 +1174,7 @@ if(! function_exists('get_birthdays')) { } $classtoday = $istoday ? ' birthday-today ' : ''; if($total) { - $o .= '
' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '
'; - $o .= ''; } } - return $o; + $tpl = get_markup_template("birthdays_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => $total, + '$event_reminders' => t('Birthday Reminders'), + '$event_title' => t('Birthdays this week:'), + '$events' => $r, + )); } } @@ -1215,7 +1220,6 @@ if(! function_exists('get_events')) { require_once('include/bbcode.php'); $a = get_app(); - $o = ''; if(! local_user()) return $o; @@ -1242,18 +1246,15 @@ if(! function_exists('get_events')) { if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) $istoday = true; } - $classtoday = (($istoday) ? ' event-today ' : ''); + $classtoday = (($istoday) ? 'event-today' : ''); - $o .= '
' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '
'; - $o .= ''; } - return $o; + $tpl = get_markup_template("events_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => count($r), + '$event_reminders' => t('Event Reminders'), + '$event_title' => t('Events this week:'), + '$events' => $r, + )); } } diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl new file mode 100644 index 00000000..c0422c1d --- /dev/null +++ b/view/birthdays_reminder.tpl @@ -0,0 +1,10 @@ +{{ if $count }} +
$event_reminders ($count)
+ +{{ endif }} + diff --git a/view/event_head.tpl b/view/event_head.tpl index 97201e72..471748b9 100644 --- a/view/event_head.tpl +++ b/view/event_head.tpl @@ -3,8 +3,17 @@ src="$baseurl/library/fullcalendar/fullcalendar.min.js"> - diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl new file mode 100644 index 00000000..fe7e3398 --- /dev/null +++ b/view/events_reminder.tpl @@ -0,0 +1,10 @@ +{{ if $count }} + + +{{ endif }} + diff --git a/view/theme/darkzero-NS/comment_item.tpl b/view/theme/darkzero-NS/comment_item.tpl new file mode 100755 index 00000000..375aff8f --- /dev/null +++ b/view/theme/darkzero-NS/comment_item.tpl @@ -0,0 +1,59 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ +
+ + {{ if $qcomment }} + {{ for $qcomment as $qc }} + $qc +   + {{ endfor }} + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/darkzero-NS/editicons.png b/view/theme/darkzero-NS/editicons.png new file mode 100644 index 00000000..171a4087 Binary files /dev/null and b/view/theme/darkzero-NS/editicons.png differ diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php index 6c1aa7f1..bdf4b8ce 100644 --- a/view/theme/darkzero-NS/theme.php +++ b/view/theme/darkzero-NS/theme.php @@ -14,6 +14,41 @@ $a->theme_info = array( function darkzero_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT '; diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl new file mode 100755 index 00000000..375aff8f --- /dev/null +++ b/view/theme/duepuntozero/comment_item.tpl @@ -0,0 +1,59 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ +
+ + {{ if $qcomment }} + {{ for $qcomment as $qc }} + $qc +   + {{ endfor }} + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/duepuntozero/editicons.png b/view/theme/duepuntozero/editicons.png new file mode 100644 index 00000000..171a4087 Binary files /dev/null and b/view/theme/duepuntozero/editicons.png differ diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c30e643c..8e131ad2 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2937,6 +2937,79 @@ aside input[type='text'] { } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } +[class^="comment-edit-bb"] { + list-style: none; + display: none; + margin: 0px 0 -5px 60px; + width: 75%; +} +[class^="comment-edit-bb"] > li { + display: inline-block; + margin: 10px 10px 0 0; + visibility: none; +} +[class^="comment-edit-bb-end"] { + clear: both; +} +.editicon { + display: inline-block; + width: 21px; + height: 21px; + background: url(editicons.png) no-repeat; + border: 0; + text-decoration: none; +} +.editicon:hover { + border: 0; +} +.boldbb { + background-position: 0px 0px; +} +.boldbb:hover { + background-position: -22px 0px; +} +.italicbb { + background-position: 0px -22px; +} +.italicbb:hover { + background-position: -22px -22px; +} +.underlinebb { + background-position: 0px -44px; +} +.underlinebb:hover { + background-position: -22px -44px; +} +.quotebb { + background-position: 0px -66px; +} +.quotebb:hover { + background-position: -22px -66px; +} +.codebb { + background-position: 0px -88px; +} +.codebb:hover { + background-position: -22px -88px; +} +.imagebb { + background-position: -44px 0px; +} +.imagebb:hover { + background-position: -66px 0px; +} +.urlbb { + background-position: -44px -22px; +} +.urlbb:hover { + background-position: -66px -22px; +} +.videobb { + background-position: -44px -44px; +} +.videobb:hover { + background-position: -66px -44px; +} .attachtype { display: block; width: 20px; height: 23px; diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index 7b42088e..8c7e6c60 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -4,6 +4,41 @@ $a->theme_info = array(); function duepuntozero_init(&$a) { $a->page['htmlhead'] .= <<< EOT + +
+
diff --git a/view/theme/slack-NS/comment_item.tpl b/view/theme/slack-NS/comment_item.tpl new file mode 100755 index 00000000..375aff8f --- /dev/null +++ b/view/theme/slack-NS/comment_item.tpl @@ -0,0 +1,59 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ +
+ + {{ if $qcomment }} + {{ for $qcomment as $qc }} + $qc +   + {{ endfor }} + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/slack-NS/editicons.png b/view/theme/slack-NS/editicons.png new file mode 100644 index 00000000..171a4087 Binary files /dev/null and b/view/theme/slack-NS/editicons.png differ diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php index a8934d03..68d57921 100644 --- a/view/theme/slack-NS/theme.php +++ b/view/theme/slack-NS/theme.php @@ -6,6 +6,41 @@ $a->theme_info = array( function slack_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT