From bcf8a571f96f1f93ee3d2f8c6a6da7f9d6bd5da8 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 05:52:28 -0400 Subject: add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push) Signed-off-by: Simon L'nu --- view/theme/dispy/communityhome.tpl | 41 ++++++++++++++++-- view/theme/dispy/default.php | 20 +++++++++ view/theme/dispy/icons/StatusNet.png | Bin 0 -> 1048 bytes view/theme/dispy/icons/email.png | Bin 0 -> 853 bytes view/theme/dispy/icons/facebook.png | Bin 0 -> 1097 bytes view/theme/dispy/icons/livejournal.png | Bin 0 -> 1571 bytes view/theme/dispy/icons/posterous.png | Bin 0 -> 1223 bytes view/theme/dispy/icons/tumblr.png | Bin 0 -> 843 bytes view/theme/dispy/icons/twitter.png | Bin 0 -> 967 bytes view/theme/dispy/icons/wordpress.png | Bin 0 -> 1346 bytes view/theme/dispy/nav.tpl | 14 +++---- view/theme/dispy/style.css | 64 ++++++++++++++++++++++------- view/theme/dispy/theme.php | 18 ++++---- view/theme/dispy/wall_item.tpl | 73 +++++++++++++++++---------------- 14 files changed, 161 insertions(+), 69 deletions(-) create mode 100644 view/theme/dispy/default.php create mode 100644 view/theme/dispy/icons/StatusNet.png create mode 100644 view/theme/dispy/icons/email.png create mode 100644 view/theme/dispy/icons/facebook.png create mode 100644 view/theme/dispy/icons/livejournal.png create mode 100644 view/theme/dispy/icons/posterous.png create mode 100644 view/theme/dispy/icons/tumblr.png create mode 100644 view/theme/dispy/icons/twitter.png create mode 100644 view/theme/dispy/icons/wordpress.png (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index dfc0467f7..2876f936e 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -2,8 +2,43 @@
$page
{{ endif }} -

PostIt to Friendica

-
-Post to Friendica from anywhere by bookmarking this Link. +{{ if $lastusers_title }} +

Help or '@NewHere'?

+ {{ endif }} + +{{ if $lastusers_title }} +

Connectable Services

+
+Facebook +StatusNet +LiveJournal +Posterous
+Tumblr +Twitter +WordPress +E-Mail +
+{{ endif }} + +

PostIt to Friendica

+
+Post to Friendica from anywhere by bookmarking this link. +
+ diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php new file mode 100644 index 000000000..e74ec1a4f --- /dev/null +++ b/view/theme/dispy/default.php @@ -0,0 +1,20 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + + + +
+ +
+
+ + + diff --git a/view/theme/dispy/icons/StatusNet.png b/view/theme/dispy/icons/StatusNet.png new file mode 100644 index 000000000..1b5f9a677 Binary files /dev/null and b/view/theme/dispy/icons/StatusNet.png differ diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png new file mode 100644 index 000000000..b9d64cb93 Binary files /dev/null and b/view/theme/dispy/icons/email.png differ diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png new file mode 100644 index 000000000..ff5129f94 Binary files /dev/null and b/view/theme/dispy/icons/facebook.png differ diff --git a/view/theme/dispy/icons/livejournal.png b/view/theme/dispy/icons/livejournal.png new file mode 100644 index 000000000..5ba5f7f7d Binary files /dev/null and b/view/theme/dispy/icons/livejournal.png differ diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png new file mode 100644 index 000000000..d0ae6face Binary files /dev/null and b/view/theme/dispy/icons/posterous.png differ diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png new file mode 100644 index 000000000..9d5fcd045 Binary files /dev/null and b/view/theme/dispy/icons/tumblr.png differ diff --git a/view/theme/dispy/icons/twitter.png b/view/theme/dispy/icons/twitter.png new file mode 100644 index 000000000..4a068451e Binary files /dev/null and b/view/theme/dispy/icons/twitter.png differ diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png new file mode 100644 index 000000000..6a4e36d45 Binary files /dev/null and b/view/theme/dispy/icons/wordpress.png differ diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 589d68352..e38b2bbe2 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -45,13 +45,7 @@ works --> {{ endif }}
- - -
+
$sitelocation
    $langselector
+ + diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 74a7809a1..c2c746767 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -251,7 +251,7 @@ input[type=submit] { * nav */ nav { - height: 85px; + height: 60px; display: block; background-color: #2e3436; color: #eeeeec; @@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 170px; position: absolute; top: -19px; - left: 15px; + left: 7px; } #nav-floater { position: fixed; @@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: transparent; border-radius: 5px; z-index: 100; - width: 28%; - height: 80px; + width: 300px; + height: 60px; } #nav-buttons { clear: both; list-style: none; padding: 0px; + margin: 0 7px 0 0; height: 25px; } #nav-buttons li { @@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } .search-box { display: inline-block; - height: 20px; - margin: 0; - position: relative; - left: 7px; - top: 5px; - /*width: 210px;*/ + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: #1d1f1d; + border-radius: 5px; } #search-text { border: 1px #eec solid; background: #2e3436; color: #eec; } +.search-box #search-text { + margin: 8px; + width: 10em; + color: #eec; +} nav #user-menu { display: block; width: 75%; @@ -529,8 +536,8 @@ nav #user-menu { border-radius: 5px; background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; clear: both; - top: 12px; - left: 7px; + top: 4px; + left: 10px; } nav #user-menu-label { font-size: 12px; @@ -641,6 +648,7 @@ nav #user-menu-label { background: #ddd; } + /** sysmsg **/ #sysmsg_info { position: fixed; @@ -752,6 +760,7 @@ aside #viewcontacts { margin: 0px 0px 0px 0px; } + /** * contacts block */ @@ -1018,7 +1027,7 @@ aside #viewcontacts { * section */ section { - margin: 20px 8% 0 4%; + margin: 20px 9% 0 4%; font-size: 0.8em; padding-right: 230px; min-width: 475px; @@ -1057,6 +1066,7 @@ section { text-decoration: none; } + /** * items */ @@ -1129,7 +1139,7 @@ section { border-radius: 5px; } [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { - margin: 0 0 5px 0; + /*margin: 0 0 5px 0;*/ } .wall-item-tools { float: right; @@ -1150,6 +1160,12 @@ section { -ms-transition: all 1s ease-in-out; transition: all 1s ease-in-out; } +.wall-item-subtools1 { + list-style: none; +} +.wall-item-subtools2 { + list-style: none; +} .wall-item-title { font-size: 1.2em; font-weight: bold; @@ -1260,6 +1276,24 @@ section { overflow: auto; width: 100%; } +#connect-services-header { + +} +#connect-services { + margin: 5px 0 0 0; +} +#extra-help-header { + +} +#extra-help { + margin: 5px 0 0 0; +} +#postit-header { + +} +#postit { + margin: 5px 0 0 0; +} /** @@ -2328,7 +2362,7 @@ div[id$="wrapper"] br { .field { /*margin-bottom: 10px;*/ /*padding-bottom: 10px;*/ - /*overflow: auto;*/ + overflow: auto; width: 100%; } .field label, label { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index db8cf5ccd..d451a6b93 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -132,11 +132,13 @@ function dispy_community_info() { $fostitJS = "javascript: (function() { 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)); + 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')) { + 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)) { @@ -144,18 +146,18 @@ function dispy_community_info() { } 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['aside'] = replace_macros($tpl, $aside); + $a->page['aside'] .= replace_macros($tpl, $aside); } -//right_aside at profile pages +//aside at profile pages if ($a->argv[0] === "profile") { - // COMMUNITY dispy_community_info(); } + diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index c9ac20c89..4b973bf93 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -15,44 +15,45 @@
{{ if $item.location }}$item.location {{ endif }}
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ 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 }} +
    +
  • + {{ if $item.lock }}
    $item.lock
    + {{ else }}
    {{ 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
-- cgit v1.2.3 From 356e654521a3d93e4ba14c4d243df259b0d21c4f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:03:04 -0400 Subject: doh fix Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index d451a6b93..190872d01 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -91,11 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); + $('.search-box').slideDown('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); + $('.search-box').slideUp('fast'); } }; // our trigger for the toolbar button @@ -131,14 +133,12 @@ function dispy_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { - 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)); + 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') ) { + 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)) { @@ -153,11 +153,13 @@ function dispy_community_info() { $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside'] .= replace_macros($tpl, $aside); + $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -//aside at profile pages +// use our 'default.php' instead of the system-wide one +$a->page['template'] = "theme/dispy-dark/default"; + +// aside on profile page if ($a->argv[0] === "profile") { dispy_community_info(); } - -- cgit v1.2.3 From 3d5e711780391fece27af1aaf915b81aca7536fe Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:20:13 -0400 Subject: WITH is going on? Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 190872d01..15e54f7e2 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -157,7 +157,8 @@ function dispy_community_info() { } // use our 'default.php' instead of the system-wide one -$a->page['template'] = "theme/dispy-dark/default"; +$theme_name = 'dispy'; +//$a->page['template'] = "theme/dispy/default"; // aside on profile page if ($a->argv[0] === "profile") { -- cgit v1.2.3 From 4a75ea2f42c44318fa018a0753c54e0a7ce42188 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:47:38 -0400 Subject: really fix it this time... Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'view/theme/dispy') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 15e54f7e2..9789fd0fa 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -91,13 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); - $('.search-box').slideDown('fast'); + $('.search-box').slideUp('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); - $('.search-box').slideUp('fast'); + $('.search-box').slideDown('fast'); } }; // our trigger for the toolbar button @@ -156,10 +156,6 @@ function dispy_community_info() { $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// use our 'default.php' instead of the system-wide one -$theme_name = 'dispy'; -//$a->page['template'] = "theme/dispy/default"; - // aside on profile page if ($a->argv[0] === "profile") { dispy_community_info(); -- cgit v1.2.3