From 8e5489846d5d9e87186b7a449227e18183489ddc Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 4 Apr 2012 23:35:07 -0400 Subject: [PATCH] update the dispy* templates Signed-off-by: Simon L'nu --- view/theme/dispy-dark/head.tpl | 24 +++++++-- view/theme/dispy-dark/jot-header.tpl | 3 +- view/theme/dispy-dark/jot.tpl | 2 +- view/theme/dispy-dark/nets.tpl | 2 +- .../theme/dispy-dark/saved_searches_aside.tpl | 6 +-- view/theme/dispy-dark/search_item.tpl | 43 ++++++++------- view/theme/dispy-dark/wall_item.tpl | 15 +++--- view/theme/dispy-dark/wallwall_item.tpl | 52 ++++++++++--------- view/theme/dispy/communityhome.tpl | 2 + view/theme/dispy/head.tpl | 24 +++++++-- view/theme/dispy/jot-header.tpl | 3 +- view/theme/dispy/jot.tpl | 2 +- view/theme/dispy/nets.tpl | 2 +- view/theme/dispy/profile_vcard.tpl | 4 +- view/theme/dispy/saved_searches_aside.tpl | 6 +-- view/theme/dispy/search_item.tpl | 43 ++++++++------- view/theme/dispy/style.css | 19 ++++--- view/theme/dispy/wall_item.tpl | 15 +++--- view/theme/dispy/wallwall_item.tpl | 52 ++++++++++--------- 19 files changed, 188 insertions(+), 131 deletions(-) mode change 100755 => 100644 view/theme/dispy/search_item.tpl diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl index f606f2f7..cd6f5ca9 100644 --- a/view/theme/dispy-dark/head.tpl +++ b/view/theme/dispy-dark/head.tpl @@ -7,7 +7,7 @@ - + '); + ins = ins.replace('&','&'); + ins = ins.replace('"','"'); + $("#comment-edit-text-" + id).val(tmpStr + ins); + } + function showHideComments(id) { if( $('#collapsed-comments-' + id).is(':visible')) { $('#collapsed-comments-' + id).hide(); diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 92eccf74..5838729c 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -9,6 +9,7 @@ function initEditor(cb) { if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; $("a#jot-perms-icon").fancybox({ 'transitionIn' : 'elastic', @@ -30,6 +31,7 @@ function initEditor(cb) { theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", theme_advanced_blockformats : "blockquote,code", + gecko_spellcheck : true, paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, @@ -296,7 +298,6 @@ function enableOnUser(){ } - function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl index 94c31da2..688ac145 100644 --- a/view/theme/dispy-dark/jot.tpl +++ b/view/theme/dispy-dark/jot.tpl @@ -11,7 +11,7 @@ - +
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl index b322717a..b0cb8890 100644 --- a/view/theme/dispy-dark/nets.tpl +++ b/view/theme/dispy-dark/nets.tpl @@ -4,7 +4,7 @@ $all diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl index 63a85dda..fb822fe5 100644 --- a/view/theme/dispy-dark/saved_searches_aside.tpl +++ b/view/theme/dispy-dark/saved_searches_aside.tpl @@ -1,12 +1,12 @@ -
+
$searchbox diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl index 54c3e389..bfad1b7b 100644 --- a/view/theme/dispy-dark/search_item.tpl +++ b/view/theme/dispy-dark/search_item.tpl @@ -1,10 +1,10 @@ -
+
- + $item.name menu
@@ -14,11 +14,21 @@
-
{{ if $item.location }}$item.location {{ endif }}
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
$item.location
+
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} +
+ $item.name +
$item.ago
+ +
+
+
$item.title
+
+
$item.body
@@ -27,25 +37,18 @@ {{ if $item.drop.dropping }}{{ endif }}
-
-
$item.title
-
-
$item.body
-
-
- $item.name -
$item.ago
- -
-
-
-
+
{{ if $item.conv }} - $item.conv.title + $item.conv.title {{ endif }}
+
+ +
+ + diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index b54f753d..8acaeaf0 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -1,10 +1,12 @@ -
+
- $item.name + + $item.name + menu
    @@ -16,10 +18,10 @@
    {{ if $item.location }}$item.location {{ endif }}
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
    {{ if $item.star }}
  • @@ -69,7 +71,6 @@
    $item.name
    $item.ago
    -
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl index b25d1340..421cddad 100644 --- a/view/theme/dispy-dark/wallwall_item.tpl +++ b/view/theme/dispy-dark/wallwall_item.tpl @@ -22,43 +22,46 @@
{{ if $item.location }}$item.location {{ endif }}
-
+
+
{{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }} -
-
- {{ if $item.star }} - - - {{ endif }} - - {{ if $item.vote }} - - {{ endif }} +
    + {{ if $item.star }} +
  • + + +
    • + {{ endif }} + {{ if $item.vote }} + + {{ endif }} +

+
    {{ if $item.filer }} -
    +
    • {{ endif }} {{ if $item.plink }} -
    +
    • {{ endif }} {{ if $item.edpost }} - +
    • {{ endif }} -
    +
  • {{ if $item.drop.dropping }}{{ endif }} -
    • {{ if $item.drop.dropping }}{{ endif }} + +
-
$item.title
@@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick {{ endfor }}
-
$item.name diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index 2876f936..340b7216 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -37,8 +37,10 @@
{{ endif }} +{{ if $lastusers_title }}

PostIt to Friendica

Post to Friendica from anywhere by bookmarking this link.
+{{ endif }} diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index f606f2f7..cd6f5ca9 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -7,7 +7,7 @@ - + '); + ins = ins.replace('&','&'); + ins = ins.replace('"','"'); + $("#comment-edit-text-" + id).val(tmpStr + ins); + } + function showHideComments(id) { if( $('#collapsed-comments-' + id).is(':visible')) { $('#collapsed-comments-' + id).hide(); diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 92eccf74..5838729c 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -9,6 +9,7 @@ function initEditor(cb) { if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; $("a#jot-perms-icon").fancybox({ 'transitionIn' : 'elastic', @@ -30,6 +31,7 @@ function initEditor(cb) { theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", theme_advanced_blockformats : "blockquote,code", + gecko_spellcheck : true, paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, @@ -296,7 +298,6 @@ function enableOnUser(){ } - function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index 94c31da2..688ac145 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -11,7 +11,7 @@ - +
diff --git a/view/theme/dispy/nets.tpl b/view/theme/dispy/nets.tpl index b322717a..b0cb8890 100644 --- a/view/theme/dispy/nets.tpl +++ b/view/theme/dispy/nets.tpl @@ -4,7 +4,7 @@ $all
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl index 350a6ce4..f14ea791 100644 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -10,9 +10,8 @@ $e.profile_name {{ endfor }} -
  • $profile.menu.chg_photo
    • +
  • $profile.menu.chg_photo
  • $profile.menu.cr_new
    • -
    {{ endif }} @@ -81,4 +80,3 @@ $contact_block - diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl index 63a85dda..fb822fe5 100644 --- a/view/theme/dispy/saved_searches_aside.tpl +++ b/view/theme/dispy/saved_searches_aside.tpl @@ -1,12 +1,12 @@ -
    +
    $searchbox diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl old mode 100755 new mode 100644 index 54c3e389..bfad1b7b --- a/view/theme/dispy/search_item.tpl +++ b/view/theme/dispy/search_item.tpl @@ -1,10 +1,10 @@ -
    +
    - + $item.name menu
    @@ -14,11 +14,21 @@
    -
    {{ if $item.location }}$item.location {{ endif }}
    +
    + {{ if $item.lock }}
    $item.lock
    + {{ else }}
    {{ endif }} +
    $item.location
    +
    -
    - {{ if $item.lock }}
    $item.lock
    - {{ else }}
    {{ endif }} +
    + $item.name +
    $item.ago
    + +
    +
    +
    $item.title
    +
    +
    $item.body
    @@ -27,25 +37,18 @@ {{ if $item.drop.dropping }}{{ endif }}
    -
    -
    $item.title
    -
    -
    $item.body
    -
    -
    - $item.name -
    $item.ago
    - -
    -
    -
    -
    +
    {{ if $item.conv }} - $item.conv.title + $item.conv.title {{ endif }}
    +
    + +
    + + diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index f4c08018..3799563f 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2085,6 +2085,9 @@ div[id$="wrapper"] br { float:left; font-size:20px; } +.event { + background: #2e2f2e; +} .vevent { border:1px solid #ccc; } @@ -2096,15 +2099,14 @@ div[id$="wrapper"] br { margin-left: 10px; margin-right: 10px; } - #new-event-link { margin-bottom: 10px; } .edit-event-link, .plink-event-link { - float: left; - margin-top: 4px; - margin-right: 4px; - margin-bottom: 15px; + /*float: left; */ + /*margin-top: 4px; */ + /*margin-right: 4px;*/ + /*margin-bottom: 15px;*/ } .event-description:before { content: url('../../../images/calendar.png'); @@ -2113,6 +2115,7 @@ div[id$="wrapper"] br { .event-start, .event-end { margin-left: 10px; width: 330px; + font-size: smaller; } .event-start .dtstart, .event-end .dtend { float: right; @@ -2187,7 +2190,7 @@ div[id$="wrapper"] br { opacity: 0.1; filter:alpha(opacity=10); float: right; - margin-right: 10px; + margin-right: 5px; } .item-select:hover, .checkeditem { opacity: 1; @@ -2213,6 +2216,10 @@ div[id$="wrapper"] br { #item-delete-selected-desc:hover { text-decoration: underline; } +.fc-state-highlight { + background: #eec; + color: #2e2f2e; +} /** diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index b54f753d..8acaeaf0 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -1,10 +1,12 @@ -
    +
    - $item.name + + $item.name + menu
      @@ -16,10 +18,10 @@
      {{ if $item.location }}$item.location {{ endif }}
    -
    - {{ if $item.lock }}
    $item.lock
    - {{ else }}
    {{ endif }} -
    +
    + {{ if $item.lock }}
    $item.lock
    + {{ else }}
    {{ endif }} +
      {{ if $item.star }}
    • @@ -69,7 +71,6 @@
      $item.name
      $item.ago
      -
    diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index b25d1340..421cddad 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -22,43 +22,46 @@
    {{ if $item.location }}$item.location {{ endif }}
    -
    +
    +
    {{ if $item.lock }}
    $item.lock
    {{ else }}
    {{ endif }} -
    -
    - {{ if $item.star }} - - - {{ endif }} - - {{ if $item.vote }} - - {{ endif }} +
      + {{ if $item.star }} +
    • + + +
      • + {{ endif }} + {{ if $item.vote }} + + {{ endif }} +

    +
      {{ if $item.filer }} -
      +
      • {{ endif }} {{ if $item.plink }} -
      +
      • {{ endif }} {{ if $item.edpost }} - +
      • {{ endif }} -
      +
    • {{ if $item.drop.dropping }}{{ endif }} -
      • {{ if $item.drop.dropping }}{{ endif }} + +
    -
    $item.title
    @@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick {{ endfor }}
    -
    $item.name