From 82106632f00dd8dc08ed4d845a4b74be53d5f563 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 10:43:52 +0200 Subject: [PATCH 1/6] template: field_combobox a text input plus a select wich updates text input value on change. html5 version commented out for poor browsers support. --- view/field_combobox.tpl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 view/field_combobox.tpl diff --git a/view/field_combobox.tpl b/view/field_combobox.tpl new file mode 100644 index 000000000..658133071 --- /dev/null +++ b/view/field_combobox.tpl @@ -0,0 +1,18 @@ + +
+ + {# html5 don't work on Chrome, Safari and IE9 + + + {{ for $field.4 as $opt=>$val }} #} + + + + + $field.3 +
+ From 7aec2fd68d6cec75d14c02b63a150d904aae817e Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 10:45:16 +0200 Subject: [PATCH 2/6] filer: info() on item filed --- include/text.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/text.php b/include/text.php index 6f66cef65..5aaf04729 100644 --- a/include/text.php +++ b/include/text.php @@ -1300,6 +1300,7 @@ function file_tag_save_file($uid,$item,$file) { $saved = get_pconfig($uid,'system','filetags'); if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']'))) set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']'); + info( t('Item filed') ); } return true; } From 0a2675d8b698302e50cb64ce5793ab9d22dee329 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 10:49:34 +0200 Subject: [PATCH 3/6] filer: replace "file as" prompt with combobox opened in fancybox --- mod/filer.php | 16 +++++++++-- view/filer_dialog.tpl | 4 +++ view/jot-header.tpl | 39 ++++++++++++++++++++------- view/theme/dispy-dark/jot-header.tpl | 40 +++++++++++++++++++++------- view/theme/dispy/jot-header.tpl | 40 +++++++++++++++++++++------- view/theme/testbubble/jot-header.tpl | 35 ++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 29 deletions(-) create mode 100644 view/filer_dialog.tpl diff --git a/mod/filer.php b/mod/filer.php index a9e213536..82537848b 100755 --- a/mod/filer.php +++ b/mod/filer.php @@ -16,8 +16,20 @@ function filer_content(&$a) { logger('filer: tag ' . $term . ' item ' . $item_id); - if($item_id && strlen($term)) + if($item_id && strlen($term)){ + // file item file_tag_save_file(local_user(),$item_id,$term); - + } else { + // return filer dialog + $filetags = get_pconfig(local_user(),'system','filetags'); + $filetags = explode("][", trim($filetags,"[]")); + $tpl = get_markup_template("filer_dialog.tpl"); + $o = replace_macros($tpl, array( + '$field' => array('term', t("File as:"), '', '', $filetags, t('- select -')), + '$submit' => t('Save'), + )); + + echo $o; + } killme(); } diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl new file mode 100644 index 000000000..ae837d6b7 --- /dev/null +++ b/view/filer_dialog.tpl @@ -0,0 +1,4 @@ +{{ inc field_combobox.tpl }}{{ endinc }} +
+ +
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 99e3aa0ec..67e5eb681 100755 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -264,15 +264,36 @@ function enableOnUser(){ } function itemFiler(id) { - reply = prompt("$fileas"); - if(reply && reply.length) { - commentBusy = true; - $('body').css('cursor', 'wait'); - $.get('filer/' + id + '?term=' + reply); - if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,3000); - liking = 1; - } + + var bordercolor = $("input").css("border-color"); + + $.get('filer/', function(data){ + $.fancybox(data); + $("#id_term").keypress(function(){ + $(this).css("border-color",bordercolor); + }) + $("#select_term").change(function(){ + $("#id_term").css("border-color",bordercolor); + }) + + $("#filer_save").click(function(e){ + e.preventDefault(); + reply = $("#id_term").val(); + if(reply && reply.length) { + commentBusy = true; + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,3000); + liking = 1; + $.fancybox.close(); + } else { + $("#id_term").css("border-color","#FF0000"); + } + return false; + }); + }); + } function jotClearLocation() { diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 4c8f59d79..92eccf740 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -264,17 +264,39 @@ function enableOnUser(){ } function itemFiler(id) { - reply = prompt("$fileas"); - if(reply && reply.length) { - commentBusy = true; - $('body').css('cursor', 'wait'); - $.get('filer/' + id + '?term=' + reply); - if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,3000); - liking = 1; - } + + var bordercolor = $("input").css("border-color"); + + $.get('filer/', function(data){ + $.fancybox(data); + $("#id_term").keypress(function(){ + $(this).css("border-color",bordercolor); + }) + $("#select_term").change(function(){ + $("#id_term").css("border-color",bordercolor); + }) + + $("#filer_save").click(function(e){ + e.preventDefault(); + reply = $("#id_term").val(); + if(reply && reply.length) { + commentBusy = true; + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,3000); + liking = 1; + $.fancybox.close(); + } else { + $("#id_term").css("border-color","#FF0000"); + } + return false; + }); + }); + } + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 4c8f59d79..92eccf740 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -264,17 +264,39 @@ function enableOnUser(){ } function itemFiler(id) { - reply = prompt("$fileas"); - if(reply && reply.length) { - commentBusy = true; - $('body').css('cursor', 'wait'); - $.get('filer/' + id + '?term=' + reply); - if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,3000); - liking = 1; - } + + var bordercolor = $("input").css("border-color"); + + $.get('filer/', function(data){ + $.fancybox(data); + $("#id_term").keypress(function(){ + $(this).css("border-color",bordercolor); + }) + $("#select_term").change(function(){ + $("#id_term").css("border-color",bordercolor); + }) + + $("#filer_save").click(function(e){ + e.preventDefault(); + reply = $("#id_term").val(); + if(reply && reply.length) { + commentBusy = true; + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,3000); + liking = 1; + $.fancybox.close(); + } else { + $("#id_term").css("border-color","#FF0000"); + } + return false; + }); + }); + } + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl index b44ea78fd..0d11da271 100755 --- a/view/theme/testbubble/jot-header.tpl +++ b/view/theme/testbubble/jot-header.tpl @@ -304,6 +304,41 @@ function initEditor(cb) { } } } + + function itemFiler(id) { + + var bordercolor = $("input").css("border-color"); + + $.get('filer/', function(data){ + $.fancybox(data); + $("#id_term").keypress(function(){ + $(this).css("border-color",bordercolor); + }) + $("#select_term").change(function(){ + $("#id_term").css("border-color",bordercolor); + }) + + $("#filer_save").click(function(e){ + e.preventDefault(); + reply = $("#id_term").val(); + if(reply && reply.length) { + commentBusy = true; + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,3000); + liking = 1; + $.fancybox.close(); + } else { + $("#id_term").css("border-color","#FF0000"); + } + return false; + }); + }); + + } + + function jotClearLocation() { $('#jot-coord').val(''); From 6bb8d42865fcd19d17e36252e1d668b1467c1d46 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 05:42:47 -0400 Subject: [PATCH 4/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: support autocomplete @-tags in plaintext mode vier navbar messed up after default theme template move profile_tabs hook use theme directory for page templates, not language directory turn on gecko spellcheck in tinymce small fix in diabook fixes in diabook provide a close-option for boxes in right_aside and store info via js and cookies provide a close-option for boxes in right_aside and store info via js and cookies form security error when using existing photo * master: From bcf8a571f96f1f93ee3d2f8c6a6da7f9d6bd5da8 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 05:52:28 -0400 Subject: [PATCH 5/6] 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-dark/communityhome.tpl | 41 ++++++++++++- view/theme/dispy-dark/default.php | 20 +++++++ view/theme/dispy-dark/nav.tpl | 14 ++--- view/theme/dispy-dark/style.css | 62 +++++++++++++++----- view/theme/dispy-dark/theme.php | 11 +++- view/theme/dispy-dark/wall_item.tpl | 73 ++++++++++++------------ 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 ++++++++++++------------ 20 files changed, 321 insertions(+), 130 deletions(-) create mode 100644 view/theme/dispy-dark/default.php 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 diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index dfc0467f7..2876f936e 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'?

+ {{ 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 000000000..e74ec1a4f --- /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 589d68352..e38b2bbe2 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -45,13 +45,7 @@ works --> {{ endif }}
-
-
- -
-
- -
+
$sitelocation
    $langselector
+
+
+ +
+
+ diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 8be441c8b..361648999 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 4c938997b..84cbc05cd 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').slideDown('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); + $('.search-box').slideUp('fast'); } }; // our trigger for the toolbar button @@ -151,6 +153,13 @@ function dispydark_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); } +// 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") { + dispydark_community_info(); +} diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index c9ac20c89..4b973bf93 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 }} - - {{ 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
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 0000000000000000000000000000000000000000..1b5f9a677d324eef9da61e99d6cd2547d818b6bd GIT binary patch literal 1048 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 V_U*7lOuzsD002ovPDHLkV1mFV?IQpH literal 0 HcmV?d00001 diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ae6face9fa03401ecba64aa26a2a35bc947ceb GIT binary patch literal 1223 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 literal 0 HcmV?d00001 diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png new file mode 100644 index 0000000000000000000000000000000000000000..6a4e36d458d25b375c877ff77b0e832fed8355ee GIT binary patch literal 1346 zcmV-I1-<%-P)Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ3 z2q_03cE9rg00hEGL_t(Y$F-JCOjK7C$A9;|H=pr?p~HtLi3|xfVk&_IDnUYo)QVM! z36ipDT-t@pMu`j9)LrAwx-hbFMMPH^ivgohSH@_Z`jOFEorHh`0|sZ_d-LwSUBDY5 z%BuG4-pf7z|2^k_KCWnQYm0?Kp^HL@UclhXn9^F0IF5753Wh=#e>!=x&np!0JnxI3 zTb5;5fk5Bzl`B{Rdh_`_$z*av2O$JPh;{$8)@ZFa^r^3}M?kNowKnqk{AUkqt#MtK zd@hIMI2guC29;6-gF&LvD8W$Z6LNr6OvBPzQz#TZA@Dqpd@e^KktjMSr9f+hX%Y^H zF%5&4uU-)jg$Ra1>o9ywOKXkmI7lgrH_=+Nn9b7F)x{sTZt?BDeH`oQp)4K;A(+o( zn4FyC&*^D8ySlhDImza&TQN=ZW8{vrLZFnwaou80wbm?UvmEW|;m+hFzg@V%wr$(i zMORr_N&TKZ{Mg^mujkLxbNo0rMn~DSWlJ%Qj_ab7!q8gdtVSTE#Bm%t4jdqvOfon$ zL?jYHN=YV@!F641+a{CA0Py0)3l`?*xpwUu2Rb|P3WaqzTI&@8cQpbjC5c3Wd-v{< zPNzA2`ZPDLU&nD>1_uY}>+7Sxzn{yOFHFn%eetw># z$Bt2O-C`N9Bk(*ArPNAzKxt_y-yb@JQi_{5Zx+S+;X6ibVXq|<5My?Y11-0Upf zhYusA1g(n~_4~l^>((a#n3Q}6mvlN!Z*MP-<1jWhhEj@DDn(OM z6PZk=*l51c00wKCt57HaFflPfFc_qr-)y>hH3KP!2@PyW@u_`#Ih_F78V#EAE#~qexlJRU)R;~ z{{4G~hlgosXkdAHnW?EM48y>-?Ui%^V(t9*^Z(-ca~c~P85$bmt9YCp+qbj4yv#qZ zUsF+0K{y=do4tF9Mk3t3dzZSpI?kOtM?*scsZR&$H!@HZDru>S@yTL zqm-h(y`4xTf)Ik1mKMU{FxA!7{C?>Y&CShBO-TOXuyf~5Mn^|+S9`$6DejTB)>d6pTT3>ZMF@e` z8X*Lp=OKh(_wL=qVlfu8S!~BCE}yb^oLoN7qeqXBQW6LRioRNFVzC&1zkG@1i{W>& zUs3+pc>MVBhTF?93@ppSG|ggK{Ih=XSO}pE(=;{$F-`Nc8*44tXUR {{ 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
From 356e654521a3d93e4ba14c4d243df259b0d21c4f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:03:04 -0400 Subject: [PATCH 6/6] doh fix Signed-off-by: Simon L'nu --- view/theme/dispy-dark/theme.php | 2 +- view/theme/dispy/theme.php | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 84cbc05cd..372757752 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -146,7 +146,7 @@ function dispydark_community_info() { } else { a_funct(); } - })();" ; + })();"; $aside['$fostitJS'] = $fostitJS; $url = $a->get_baseurl($ssl_state); 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(); } -