From 8fe77e5b868edab07fbffe35f0f31f2b0e7543d0 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 01:01:59 -0400 Subject: implement filer/file-as Signed-off-by: Simon L'nu --- view/theme/dispy/icons.png | Bin 18998 -> 29977 bytes view/theme/dispy/icons.svg | 22 ++++++++++++++++++++-- view/theme/dispy/style.css | 13 +++++++++++++ view/theme/dispy/wall_item.tpl | 9 ++++++--- 4 files changed, 39 insertions(+), 5 deletions(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png index 2f0459bd3..f42330d65 100644 Binary files a/view/theme/dispy/icons.png and b/view/theme/dispy/icons.png differ diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg index 998e2641f..7b82b94ea 100644 --- a/view/theme/dispy/icons.svg +++ b/view/theme/dispy/icons.svg @@ -52,7 +52,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.9403009" - inkscape:cx="73.744486" + inkscape:cx="64.725266" inkscape:cy="108.36719" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -63,7 +63,7 @@ inkscape:window-width="1065" inkscape:window-height="742" inkscape:window-x="40" - inkscape:window-y="61" + inkscape:window-y="50" inkscape:window-maximized="0"> + + + + diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 6547cf986..9b480385d 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2023,6 +2023,16 @@ div[id$="wrapper"] br { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } +.filesavetags { + margin: 20px 0; + opacity: 0.5; + filter:alpha(opacity=50); +} +.filesavetags:hover { + margin: 20px 0; + opacity: 1.0 !important; + filter:alpha(opacity=100) !important; +} .item-select { opacity: 0.1; filter:alpha(opacity=10); @@ -2474,6 +2484,9 @@ div[id$="wrapper"] br { .dislike { background-position: -190px 0; } +.file-as { + background-position: -230px -60px; +} .like { background-position: -211px 0; } diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index c67a88635..c9ac20c89 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -4,9 +4,7 @@
- - $item.name - + $item.name menu
    @@ -37,6 +35,11 @@
{{ endif }} + + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}
{{ endif }} -- cgit v1.2.3 From 1d56224b08fe9781a050143f14c45fd518c5ca93 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 01:12:28 -0400 Subject: increase version to 1.0 for dispys \o/ Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 26e07b1f7..e3f8f5b45 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -3,7 +3,7 @@ /* * Name: Dispy * Description: Dispy, Friendica theme - * Version: 0.9 + * Version: 1.0 * Author: unknown * Maintainer: Simon */ -- cgit v1.2.3 From 2c4312012995aa3411cf5e5dbd0eb934a0801797 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 03:22:16 -0400 Subject: dispy-dark not experimental. start implementing fpostit Signed-off-by: Simon L'nu --- view/theme/dispy/communityhome.tpl | 4 + view/theme/dispy/fpostit/README | 8 ++ view/theme/dispy/fpostit/fpostit.js | 14 ++++ view/theme/dispy/fpostit/fpostit.php | 134 ++++++++++++++++++++++++++++++ view/theme/dispy/fpostit/friendica-32.png | Bin 0 -> 1593 bytes view/theme/dispy/fpostit/friendika-32.png | Bin 0 -> 1593 bytes view/theme/dispy/style.css | 27 +++++- view/theme/dispy/theme.php | 28 +++++++ view/theme/dispy/wallwall_item.tpl | 5 +- 9 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 view/theme/dispy/communityhome.tpl create mode 100644 view/theme/dispy/fpostit/README create mode 100755 view/theme/dispy/fpostit/fpostit.js create mode 100644 view/theme/dispy/fpostit/fpostit.php create mode 100644 view/theme/dispy/fpostit/friendica-32.png create mode 100644 view/theme/dispy/fpostit/friendika-32.png (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl new file mode 100644 index 000000000..0659ebe20 --- /dev/null +++ b/view/theme/dispy/communityhome.tpl @@ -0,0 +1,4 @@ +{{ if $lastusers_title }} +

PostIt to Friendica

+
Post to Friendica from anywhere by bookmarking this Link.
+{{ endif }} diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README new file mode 100644 index 000000000..39b7c5761 --- /dev/null +++ b/view/theme/dispy/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js new file mode 100755 index 000000000..d18f5d345 --- /dev/null +++ b/view/theme/dispy/fpostit/fpostit.js @@ -0,0 +1,14 @@ +javascript: (function() { + the_url = 'view/theme/dispy/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? + document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + location.href = the_url + }; + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct(); + } + })();" diff --git a/view/theme/dispy/fpostit/fpostit.php b/view/theme/dispy/fpostit/fpostit.php new file mode 100644 index 000000000..d00182946 --- /dev/null +++ b/view/theme/dispy/fpostit/fpostit.php @@ -0,0 +1,134 @@ + + + + + + + + $content); + + // echo "posting to: $url
"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password. Please try again."; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo << +

Friendica Bookmarklet

+
+ +
+
+ Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)

+ Account ID:
+ Password:
+
+   $error +
+

+
+EOF; + +} +?> + + + diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png new file mode 100644 index 000000000..61764bf20 Binary files /dev/null and b/view/theme/dispy/fpostit/friendica-32.png differ diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png new file mode 100644 index 000000000..61764bf20 Binary files /dev/null and b/view/theme/dispy/fpostit/friendika-32.png differ diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 9b480385d..935ca507e 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2086,13 +2086,13 @@ div[id$="wrapper"] br { #group-sidebar { margin-bottom: 10px; } -.group-selected, .nets-selected { +.group-selected, .nets-selected, .fileas-selected { padding: 3px; color: #111; background: #f8f8f8; font-weight: bold; } -.group-selected:hover, .nets-selected:hover { +.group-selected:hover, .nets-selected:hover, .fileas-selected:hover { color: #111; } .groupsideedit { @@ -2784,6 +2784,29 @@ footer { .network-star.icon.starred { display: inline-block; } +#fileas-sidebar { + +} +.fileas-ul { + padding: 0; +} + + + +/* + * ADDONS THEMING + */ + +#sidebar-page-list { + +} +#sidebar-page-list ul { + padding: 0; + margin: 5px 0; +} +#sidebar-page-list li { + list-style: none; +} @media handheld { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index e3f8f5b45..e898346ef 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -6,6 +6,7 @@ * Version: 1.0 * Author: unknown * Maintainer: Simon + * Screenshot: Screenshot */ @@ -126,3 +127,30 @@ $(document).ready(function() { EOT; +function dispy_community_info() { + $a = get_app(); + + $fostitJS = "javascript: (function() { + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? + document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + location.href = the_url; + } + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct(); + } + })();" ; + + $aside['$fostitJS'] = $fostitJS; + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; + + $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); + $a->page['right_aside'] = replace_macros($tpl, $aside); +} + diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index f251d7352..b25d13409 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -38,11 +38,14 @@ {{ if $item.vote.share }} - {{ endif }} {{ endif }} + {{ if $item.filer }} +
+ {{ endif }} {{ if $item.plink }}
{{ endif }} -- cgit v1.2.3 From 3d62cb97822e0bd9e5be0c404664667cb7cb8d98 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 17:13:24 -0400 Subject: minor fix to dispy theme.php Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index e898346ef..3fa9a3353 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -131,7 +131,7 @@ function dispy_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); -- cgit v1.2.3 From 3d11c22b01e1581b4606312dcc38dfd7b7906502 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 22:45:44 -0400 Subject: add in the search box Signed-off-by: Simon L'nu --- view/theme/dispy/nav.tpl | 16 +++++++++++----- view/theme/dispy/style.css | 9 +++++++++ view/theme/dispy/theme.php | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 11469dc66..589d68352 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -5,7 +5,7 @@ - {{ 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 f606f2f7e..cd6f5ca97 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 92eccf740..5838729cc 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 94c31da23..688ac1451 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 b322717ad..b0cb8890c 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 350a6ce4a..f14ea7915 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 63a85dda5..fb822fe5d 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 54c3e389c..bfad1b7b7 --- 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 f4c080182..3799563ff 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 b54f753d3..8acaeaf02 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 b25d13409..421cddadf 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 -- cgit v1.2.3 From 9ee424c1e34df40b2a2c1df13b719bc1b851bc24 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 4 Apr 2012 23:47:35 -0400 Subject: style categorytags Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 3799563ff..d0e7a2ef5 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2176,12 +2176,12 @@ div[id$="wrapper"] br { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } -.filesavetags { +.filesavetags, .categorytags { margin: 20px 0; opacity: 0.5; filter:alpha(opacity=50); } -.filesavetags:hover { +.filesavetags:hover, .categorytags:hover { margin: 20px 0; opacity: 1.0 !important; filter:alpha(opacity=100) !important; -- cgit v1.2.3 From df82affe2f34154919bd12771a0044f7ed2c0662 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 5 Apr 2012 00:04:23 -0400 Subject: finish styling category tags and category input Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index d0e7a2ef5..f8287c6ec 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -856,6 +856,16 @@ aside #viewcontacts { border-radius: 5px; vertical-align: middle; } +#jot-category { + margin: 5px 0; + border-radius: 5px; + border: 1px #ccc solid; + color: #666; + font-size: small; +} +#jot-category:focus { + color: #111; +} #jot #character-counter { width: 6%; float: right; -- cgit v1.2.3