From ccdac0cd99edafdae4348709fcd23f446d1aee18 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 19 Apr 2012 18:47:54 -0400 Subject: [PATCH 1/3] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From eb9ddb884a9fa2c9a1cc351830e953cf477a3a40 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 20 Apr 2012 05:56:54 -0400 Subject: [PATCH 2/3] optimise imgs; add some comment editing knobs Signed-off-by: Simon L'nu --- view/theme/dispy-dark/bottom.tpl | 51 ++ view/theme/dispy-dark/comment_item.tpl | 43 +- view/theme/dispy-dark/default.php | 9 +- view/theme/dispy-dark/editicons.png | Bin 0 -> 4911 bytes view/theme/dispy-dark/editicons.svg | 725 +++++++++++++++++++++++++ view/theme/dispy-dark/icons.png | Bin 30271 -> 20197 bytes view/theme/dispy-dark/nav.tpl | 2 +- view/theme/dispy-dark/style.css | 87 ++- view/theme/dispy/bottom.tpl | 51 ++ view/theme/dispy/comment_item.tpl | 43 +- view/theme/dispy/default.php | 9 +- view/theme/dispy/editicons.png | Bin 0 -> 4923 bytes view/theme/dispy/editicons.svg | 725 +++++++++++++++++++++++++ view/theme/dispy/icons.png | Bin 29977 -> 19715 bytes view/theme/dispy/icons/email.png | Bin 853 -> 732 bytes view/theme/dispy/icons/facebook.png | Bin 1097 -> 1075 bytes view/theme/dispy/icons/posterous.png | Bin 1223 -> 1204 bytes view/theme/dispy/icons/tumblr.png | Bin 843 -> 817 bytes view/theme/dispy/icons/wordpress.png | Bin 1346 -> 1224 bytes view/theme/dispy/nav.tpl | 2 +- view/theme/dispy/style.css | 89 ++- 21 files changed, 1815 insertions(+), 21 deletions(-) create mode 100644 view/theme/dispy-dark/editicons.png create mode 100644 view/theme/dispy-dark/editicons.svg create mode 100644 view/theme/dispy/editicons.png create mode 100644 view/theme/dispy/editicons.svg diff --git a/view/theme/dispy-dark/bottom.tpl b/view/theme/dispy-dark/bottom.tpl index 1b7dda8f8..a0298a7de 100644 --- a/view/theme/dispy-dark/bottom.tpl +++ b/view/theme/dispy-dark/bottom.tpl @@ -1 +1,52 @@ + diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl index adf2772af..371477c5b 100644 --- a/view/theme/dispy-dark/comment_item.tpl +++ b/view/theme/dispy-dark/comment_item.tpl @@ -11,14 +11,49 @@ $mytitle
- +
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+
+ {{ if $qcomment }}
- - {{ for $qcomment as $qc }} + {{ for $qcomment as $qc }} - {{ endfor }} + {{ endfor }}
{{ endif }} diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index 729f9be2a..c3e6c9119 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -10,6 +10,9 @@
+
+ +
-
+
+
+
+ +