diff --git a/mod/item.php b/mod/item.php index 5baae2bde7..24730f53ee 100755 --- a/mod/item.php +++ b/mod/item.php @@ -171,13 +171,13 @@ function item_post(&$a) { $str_contact_allow = $orig_post['allow_cid']; $str_group_deny = $orig_post['deny_gid']; $str_contact_deny = $orig_post['deny_cid']; - $title = $orig_post['title']; $location = $orig_post['location']; $coord = $orig_post['coord']; $verb = $orig_post['verb']; $emailcc = $orig_post['emailcc']; $app = $orig_post['app']; $categories = $orig_post['file']; + $title = notags(trim($_REQUEST['title'])); $body = escape_tags(trim($_REQUEST['body'])); $private = $orig_post['private']; $pubmail_enable = $orig_post['pubmail']; diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index dfc0467f79..2876f936ee 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/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'?

+
+Friendica Support
+Let's talk
+Local Friendica
+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-dark/default.php b/view/theme/dispy-dark/default.php new file mode 100644 index 0000000000..e74ec1a4f9 --- /dev/null +++ b/view/theme/dispy-dark/default.php @@ -0,0 +1,20 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + + + +
+
+
+ + + + diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 589d683521..e38b2bbe2f 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -45,13 +45,7 @@ works --> {{ endif }}
-
-
- -
-
- -
+
$sitelocation
+
+
+ +
+
+ diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 8be441c8b1..3616489992 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -251,7 +251,7 @@ input[type=submit] { * nav */ nav { - height: 85px; + height: 60px; display: block; background-color: #1d1f1d; 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: #2e2f2e; 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; +} /** diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 4c938997bc..cebe9eb4fc 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -91,11 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); + $('.search-box').slideUp('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); + $('.search-box').slideDown('fast'); } }; // our trigger for the toolbar button @@ -144,13 +146,17 @@ function dispydark_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_bottom'] = replace_macros($tpl, $aside); } +// aside on profile page +if ($a->argv[0] === "profile") { + dispydark_community_info(); +} diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index c9ac20c894..4b973bf93e 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/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 }} -
- - - {{ if $item.vote.share }} - {{ endif }} - -
- {{ 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
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index dfc0467f79..2876f936ee 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 0000000000..e74ec1a4f9 --- /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 0000000000..1b5f9a677d 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 0000000000..b9d64cb931 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 0000000000..ff5129f947 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 0000000000..5ba5f7f7d8 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 0000000000..d0ae6face9 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 0000000000..9d5fcd045b 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 0000000000..4a068451e5 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 0000000000..6a4e36d458 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 589d683521..e38b2bbe2f 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 74a7809a1f..c2c7467671 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 db8cf5ccdf..9789fd0fa3 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').slideUp('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); + $('.search-box').slideDown('fast'); } }; // our trigger for the toolbar button @@ -131,7 +133,7 @@ function dispy_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' + + 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)); @@ -144,18 +146,17 @@ 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_bottom'] = replace_macros($tpl, $aside); } -//right_aside at profile pages +// aside on profile page 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 c9ac20c894..4b973bf93e 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 }} + +
-
$item.title
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 33be8b3590..c86df75f59 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -275,7 +275,6 @@ div.wall-item-content-wrapper.shiny { float: left; } - #jot-title { border: 0px; margin: 0px;