From 3b394ea43fd3bc011f98a9160a8b408283f97ebc Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 25 Oct 2012 18:42:42 -0700 Subject: comments sort of working again but now need to fix the threading which was ported when it was only half working --- view/css/mod_register.css | 33 ++++++ view/css/mod_zregister.css | 33 ------ view/js/mod_register.js | 29 +++++ view/js/mod_zregister.js | 29 ----- view/php/mod_register.php | 3 + view/php/mod_zregister.php | 3 - view/theme/duepuntozero/css/style.css | 193 +++++++++++++++++++++++++++++----- view/tpl/register.tpl | 80 ++++++-------- view/tpl/wall_thread.tpl | 71 +++++++------ view/tpl/zregister.tpl | 45 -------- 10 files changed, 304 insertions(+), 215 deletions(-) create mode 100644 view/css/mod_register.css delete mode 100644 view/css/mod_zregister.css create mode 100644 view/js/mod_register.js delete mode 100644 view/js/mod_zregister.js create mode 100644 view/php/mod_register.php delete mode 100644 view/php/mod_zregister.php delete mode 100644 view/tpl/zregister.tpl (limited to 'view') diff --git a/view/css/mod_register.css b/view/css/mod_register.css new file mode 100644 index 000000000..581dee1a0 --- /dev/null +++ b/view/css/mod_register.css @@ -0,0 +1,33 @@ + +h2 { + margin-left: 15%; + margin-top: 15%; +} + +#register-form { + font-size: 1.4em; + margin-left: 15%; + margin-top: 5%; +} + +.register-label { + float: left; + width: 275px; +} + +.register-input { + float: left; + width: 275px; + padding: 5px; +} + +.register-feedback { + float: left; + margin-left: 45px; +} + +.register-field-end { + clear: both; + margin-bottom: 20px; +} + diff --git a/view/css/mod_zregister.css b/view/css/mod_zregister.css deleted file mode 100644 index a5bd9a5cf..000000000 --- a/view/css/mod_zregister.css +++ /dev/null @@ -1,33 +0,0 @@ - -h2 { - margin-left: 15%; - margin-top: 15%; -} - -#zregister-form { - font-size: 1.4em; - margin-left: 15%; - margin-top: 5%; -} - -.zregister-label { - float: left; - width: 275px; -} - -.zregister-input { - float: left; - width: 275px; - padding: 5px; -} - -.zregister-feedback { - float: left; - margin-left: 45px; -} - -.zregister-field-end { - clear: both; - margin-bottom: 20px; -} - diff --git a/view/js/mod_register.js b/view/js/mod_register.js new file mode 100644 index 000000000..839c91911 --- /dev/null +++ b/view/js/mod_register.js @@ -0,0 +1,29 @@ + $(document).ready(function() { + $("#register-email").blur(function() { + var zreg_email = $("#register-email").val(); + $.get("register/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) { + $("#register-email-feedback").html(data.message); + zFormError("#register-email-feedback",data.error); + }); + }); + $("#register-password").blur(function() { + if(($("#register-password").val()).length < 6 ) { + $("#register-password-feedback").html(aStr['pwshort']); + zFormError("#register-password-feedback",true); + } + else { + $("#register-password-feedback").html(""); + zFormError("#register-password-feedback",false); + } + }); + $("#register-password2").blur(function() { + if($("#register-password").val() != $("#register-password2").val()) { + $("#register-password2-feedback").html(aStr['pwnomatch']); + zFormError("#register-password2-feedback",true); + } + else { + $("#register-password2-feedback").html(""); + zFormError("#register-password2-feedback",false); + } + }); + }); diff --git a/view/js/mod_zregister.js b/view/js/mod_zregister.js deleted file mode 100644 index 6dcb4058c..000000000 --- a/view/js/mod_zregister.js +++ /dev/null @@ -1,29 +0,0 @@ - $(document).ready(function() { - $("#zregister-email").blur(function() { - var zreg_email = $("#zregister-email").val(); - $.get("zregister/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) { - $("#zregister-email-feedback").html(data.message); - zFormError("#zregister-email-feedback",data.error); - }); - }); - $("#zregister-password").blur(function() { - if(($("#zregister-password").val()).length < 6 ) { - $("#zregister-password-feedback").html(aStr['pwshort']); - zFormError("#zregister-password-feedback",true); - } - else { - $("#zregister-password-feedback").html(""); - zFormError("#zregister-password-feedback",false); - } - }); - $("#zregister-password2").blur(function() { - if($("#zregister-password").val() != $("#zregister-password2").val()) { - $("#zregister-password2-feedback").html(aStr['pwnomatch']); - zFormError("#zregister-password2-feedback",true); - } - else { - $("#zregister-password2-feedback").html(""); - zFormError("#zregister-password2-feedback",false); - } - }); - }); diff --git a/view/php/mod_register.php b/view/php/mod_register.php new file mode 100644 index 000000000..e7709cbd8 --- /dev/null +++ b/view/php/mod_register.php @@ -0,0 +1,3 @@ +page['template'] = 'full'; diff --git a/view/php/mod_zregister.php b/view/php/mod_zregister.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_zregister.php +++ /dev/null @@ -1,3 +0,0 @@ -page['template'] = 'full'; diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css index 0c051487e..94092bbf0 100644 --- a/view/theme/duepuntozero/css/style.css +++ b/view/theme/duepuntozero/css/style.css @@ -964,10 +964,8 @@ input#dfrn-url { .wall-item-content-wrapper { margin-top: 10px; - border: 1px solid #CCC; + border-left: 1px solid #e0e0e0; position: relative; - -moz-border-radius: 3px; - border-radius: 3px; } .tread-wrapper .tread-wrapper { @@ -975,8 +973,9 @@ input#dfrn-url { } .wall-item-content-wrapper.comment { -# margin-left: 50px; - background: #EEEEEE; + background: #ffffff; + border-left: 1px solid #e0e0e0; + margin-left: 50px; } .wall-item-like.comment, .wall-item-dislike.comment { @@ -1210,12 +1209,12 @@ input#dfrn-url { .comment-edit-wrapper { margin-top: 15px; - background: #f3f3f3; + background: #ffffff; margin-left: 50px; } .comment-wwedit-wrapper { - background: #f3f3f3; + background: #ffffff; } .comment-edit-photo { @@ -1235,11 +1234,30 @@ input#dfrn-url { .comment-edit-text-empty, .comment-edit-text-full { float: left; margin-top: 10px; - -moz-border-radius: 3px; - border-radius: 3px; - border: 1px solid #cccccc; + border-left: 1px solid #e0e0e0; padding: 3px 1px 1px 3px; } + +.comment-edit-text-empty { + color: gray; + height: 1.5em; + width: 175px; + overflow: auto; + margin-bottom: 10px; +} + +.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty { + height: 1.5em; +} + +.comment-edit-text-full { + color: black; + height: 150px; + width: 350px; + overflow: auto; +} + + .comment-edit-text-end { clear: both; } @@ -1678,6 +1696,12 @@ input#dfrn-url { width: 587px; } +#profile-jot-text_parent, .mceLayout { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + #profile-jot-text { height: 20px; color:#cccccc; @@ -1686,6 +1710,137 @@ input#dfrn-url { -moz-border-radius: 3px; border-radius: 3px; } +#profile-jot-text:hover { + color: #000000; +} + +.wall-item-photo, .photo, .contact-block-img, .my-comment-photo { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + + +#datebrowse-sidebar select { + margin-left: 25px; + border-radius: 3px; + -moz-border-radius: 3px; + opacity: 0.3; + filter:alpha(opacity=30); +} + +#datebrowse-sidebar select:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#posted-date-selector { + margin-left: 30px !important; + margin-top: 5px !important; + margin-right: 0px !important; + margin-bottom: 0px !important; +} + +#posted-date-selector:hover { + box-shadow: 4px 4px 3px 0 #444444; + margin-left: 25px !important; + margin-top: 0px !important; + margin-right: 5px !important; + margin-bottom: 5px !important; + +} + +#side-bar-photos-albums { + margin-top: 15px; +} + +#side-bar-photos-albums ul { + list-style: none; +} + +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} +.settings-widget .selected { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + +#sidebar-page-list .label { + margin-left: 5px; +} + + +.photo { + border: 1px solid #AAAAAA; +} + +.photo-top-photo, .photo-album-photo { + padding: 10px; + max-width: 300px; + border: 1px solid #888888; +} + +.rotleft1 { +-webkit-transform: rotate(-1deg); +-moz-transform: rotate(-1deg); +-ms-transform: rotate(-1deg); +-o-transform: rotate(-1deg); +} + +.rotleft2 { +-webkit-transform: rotate(-2deg); +-moz-transform: rotate(-2deg); +-ms-transform: rotate(-2deg); +-o-transform: rotate(-2deg); +} + +.rotleft3 { +-webkit-transform: rotate(-3deg); +-moz-transform: rotate(-3deg); +-ms-transform: rotate(-3deg); +-o-transform: rotate(-3deg); +} + +.rotleft4 { +-webkit-transform: rotate(-4deg); +-moz-transform: rotate(-4deg); +-ms-transform: rotate(-4deg); +-o-transform: rotate(-4deg); +} + + +.rotright1 { +-webkit-transform: rotate(1deg); +-moz-transform: rotate(1deg); +-ms-transform: rotate(1deg); +-o-transform: rotate(1deg); +} + +.rotright2 { +-webkit-transform: rotate(2deg); +-moz-transform: rotate(2deg); +-ms-transform: rotate(2deg); +-o-transform: rotate(2deg); +} + +.rotright3 { +-webkit-transform: rotate(3deg); +-moz-transform: rotate(3deg); +-ms-transform: rotate(3deg); +-o-transform: rotate(3deg); +} + +.rotright4 { +-webkit-transform: rotate(4deg); +-moz-transform: rotate(4deg); +-ms-transform: rotate(4deg); +-o-transform: rotate(4deg); +} + /** acl **/ @@ -1793,24 +1948,6 @@ input#dfrn-url { /** /acl **/ -.comment-edit-text-empty { - color: gray; - height: 5em; - width: 175px; - overflow: auto; - margin-bottom: 10px; -} - -.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty { - height: 1.5em; -} - -.comment-edit-text-full { - color: black; - height: 150px; - width: 350px; - overflow: auto; -} #group-new-submit-wrapper { margin-top: 30px; diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 244762c4b..4b565718d 100644 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -1,57 +1,45 @@ -

$regtitle

+

$title

- - - $registertext - -

$realpeople

- -

$fillwith

-

$fillext

+{{ if $registertext }} +
$registertext
+{{ endif }} {{ if $invitations }} -

$invite_desc

-
- - -
-
+ + +
+
{{ endif }} + + +
+
+ + + +
+
+ + + +
+
+ + {{ if $enable_tos }} + + +
+
+ {{ else }} + + {{ endif }} + + +
-
- - -
-
- - -
- - -
-
- -

$nickdesc

- -
- -
@$sitename
-
-
- - $publish - -
- -
-
- -$license - - diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl index ade8264fa..a67334e33 100644 --- a/view/tpl/wall_thread.tpl +++ b/view/tpl/wall_thread.tpl @@ -6,38 +6,40 @@ {{endif}}
-{{ if $item.threaded }} -
-{{ else }} -
-{{ endif }} +
-
-
- - $item.name - +
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
+ + $item.name menu -
-
    - $item.item_photo_menu -
-
+
+
    + $item.item_photo_menu +
+
+
{{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- -
+ $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
+
$item.ago
+
$item.title
@@ -47,6 +49,15 @@ $tag {{ endfor }}
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
@@ -59,7 +70,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} @@ -71,39 +82,37 @@ {{ endif }} {{ if $item.filer }} - {{ endif }} + {{ endif }} +
{{ if $item.drop.dropping }}{{ endif }}
- {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.pagedrop }}{{ endif }}
-
+
$item.dislike
{{ if $item.threaded }} {{ if $item.comment }} -
+
$item.comment
{{ endif }} {{ endif }} -
+
{{ for $item.children as $item }} {{ inc $item.template }}{{ endinc }} {{ endfor }} -{{ if $item.comment }} {{ if $item.flatten }}
$item.comment
{{ endif }} -{{ endif }}
{{if $item.comment_lastcollapsed}}{{endif}} - diff --git a/view/tpl/zregister.tpl b/view/tpl/zregister.tpl deleted file mode 100644 index 3a2c38a13..000000000 --- a/view/tpl/zregister.tpl +++ /dev/null @@ -1,45 +0,0 @@ -

$title

- -
- -{{ if $registertext }} -
$registertext
-{{ endif }} - -{{ if $invitations }} -

$invite_desc

- - - -
-
-{{ endif }} - - - -
-
- - - -
-
- - - -
-
- - {{ if $enable_tos }} - - -
-
- {{ else }} - - {{ endif }} - - -
- -
-- cgit v1.2.3