From b522ffeea5a52de36ad4c3be7bf10b38efc1309e Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Tue, 31 Jul 2012 08:00:24 -0600 Subject: [PATCH] Frost: reduce DOM elements by about 20%; other tweaks and fixes --- view/theme/frost-mobile/TODO | 4 +- view/theme/frost-mobile/comment_item.tpl | 12 ++-- view/theme/frost-mobile/nav.tpl | 25 ++++--- view/theme/frost-mobile/style.css | 24 ++++--- view/theme/frost-mobile/wall_item.tpl | 38 +++++----- view/theme/frost-mobile/wallwall_item.tpl | 87 +++++++++++++++++++++++ view/theme/frost/comment_item.tpl | 12 ++-- view/theme/frost/nav.tpl | 24 ++++--- view/theme/frost/style.css | 17 ++--- view/theme/frost/wall_item.tpl | 44 ++++++------ view/theme/frost/wallwall_item.tpl | 86 ++++++++++++++++++++++ 11 files changed, 280 insertions(+), 93 deletions(-) create mode 100644 view/theme/frost-mobile/wallwall_item.tpl create mode 100644 view/theme/frost/wallwall_item.tpl diff --git a/view/theme/frost-mobile/TODO b/view/theme/frost-mobile/TODO index 691154c3cb..cc35b63050 100644 --- a/view/theme/frost-mobile/TODO +++ b/view/theme/frost-mobile/TODO @@ -14,8 +14,10 @@ Photo album display? - Admin: access to more pages than summary? +- Embedded video playback is way too big + - Needs to be faster! - - Reduce DOM elements (4100 for 10 items) + - Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items) - Automatically set limit of 10 items for Network and Profile? diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl index 8fb5783695..b5b0e9d289 100755 --- a/view/theme/frost-mobile/comment_item.tpl +++ b/view/theme/frost-mobile/comment_item.tpl @@ -19,10 +19,10 @@ -
- $mytitle -
-
+ + $mytitle + + -
+ {{ if $qcomment }} @@ -68,7 +68,7 @@ --> -
+ diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl index bc12409e2c..54f7b54ca5 100644 --- a/view/theme/frost-mobile/nav.tpl +++ b/view/theme/frost-mobile/nav.tpl @@ -3,8 +3,6 @@ - {{ if $nav.login }}$nav.login.1 {{ endif }} - @@ -13,11 +11,20 @@ - {{ if $nav.register }}$nav.register.1{{ endif }} - - + diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index ec260de79d..88273a7035 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1185,7 +1185,7 @@ input#dfrn-url { display: none; z-index: 10000; } -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none } .wall-item-photo-menu li a { display: block; padding: 2px; } .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } @@ -1205,7 +1205,7 @@ input#dfrn-url { height: 30px !important; } -.wallwall .wall-item-photo-end { +.wallwall /*.wall-item-photo-end*/ { clear: both; } @@ -1247,7 +1247,7 @@ input#dfrn-url { .wall-item-like-buttons { float: left; - margin-right: 10px; + margin-right: 3px; } .like-rotator { @@ -1294,18 +1294,18 @@ input#dfrn-url { float: right; } -.wall-item-delete-end { +/*.wall-item-delete-end { clear: both; -} +}*/ .wall-item-delete-icon { border: none; } -.wall-item-wrapper-end { +/*.wall-item-wrapper-end { clear: both; -} +}*/ .wall-item-name-link { font-weight: bold; text-decoration: none; @@ -1343,9 +1343,9 @@ input#dfrn-url { /*width: 450px;*/ } -.wall-item-title-end { +/*.wall-item-title-end { clear: both; -} +}*/ .wall-item-body { text-align: justify; @@ -1370,7 +1370,7 @@ input#dfrn-url { /* background-image: url("head.jpg"); background-position: 0 -20px; background-repeat: repeat-x;*/ - padding: 5px 10px 0px; + padding: 5px 5px 0px; height: 32px; } .wall-item-author { @@ -1394,6 +1394,7 @@ input#dfrn-url { } .comment-wwedit-wrapper { + display: block; margin-top: 15px; background: #f3f3f3; margin-left: 10px; @@ -3571,7 +3572,8 @@ aside input[type='text'] { background-image: url('images/unlock.png'); background-repeat: no-repeat; } -.video { display: none; background-position: -48px -32px;} +.icon.video { display: none; background-position: -48px -32px;} +.oembed.video a { display: block; } .youtube { background-position: -64px -32px;} /*.attach { background-position: -80px -32px; }*/ .icon.attach { diff --git a/view/theme/frost-mobile/wall_item.tpl b/view/theme/frost-mobile/wall_item.tpl index 65e2812f9a..d7b75f54d8 100644 --- a/view/theme/frost-mobile/wall_item.tpl +++ b/view/theme/frost-mobile/wall_item.tpl @@ -1,5 +1,5 @@ -
+
-
+
- {{ if $item.lock }}
$item.lock
+ {{ if $item.lock }}$item.lock {{ else }}
{{ endif }}
$item.location
-
+ $item.name
$item.ago
-
+
$item.title
-
+
$item.body -
+ {{ for $item.tags as $tag }} - $tag + $tag {{ endfor }} -
+
@@ -51,7 +51,7 @@
{{ endif }} {{ if $item.plink }} - + {{ endif }} {{ if $item.edpost }} @@ -64,19 +64,19 @@ {{ if $item.filer }} {{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
+ + {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }} -
+
-
+
$item.like
$item.dislike
-
+ $item.comment -
+ -
- + + diff --git a/view/theme/frost-mobile/wallwall_item.tpl b/view/theme/frost-mobile/wallwall_item.tpl new file mode 100644 index 0000000000..562868c237 --- /dev/null +++ b/view/theme/frost-mobile/wallwall_item.tpl @@ -0,0 +1,87 @@ + + +
+
+
+ + $item.owner_name +
+
$item.wall
+ +
+ + $item.name + + +
+ +
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
$item.location
+
+
+ + $item.name $item.to $item.owner_name $item.vwall
+
$item.ago
+ +
+
$item.title
+ +
$item.body + + {{ for $item.tags as $tag }} + $tag + {{ endfor }} + +
+
+
+ {{ if $item.vote }} + + {{ endif }} + {{ if $item.plink }} + + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} + + {{ if $item.star }} + + + {{ endif }} + {{ if $item.filer }} + + {{ endif }} + + + {{ if $item.drop.dropping }}{{ endif }} + + {{ if $item.drop.dropping }}{{ endif }} + +
+
+ +
$item.like
+
$item.dislike
+
+ + $item.comment + + + + + diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl index 2b15cbc7ee..bdc2ef5e6d 100755 --- a/view/theme/frost/comment_item.tpl +++ b/view/theme/frost/comment_item.tpl @@ -19,10 +19,10 @@ -
- $mytitle -
-
+ + $mytitle + + -
+ {{ if $qcomment }} @@ -68,7 +68,7 @@ -
+ diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl index da7554257d..6ae19650e0 100644 --- a/view/theme/frost/nav.tpl +++ b/view/theme/frost/nav.tpl @@ -3,8 +3,6 @@
$sitelocation
- {{ if $nav.login }}$nav.login.1 {{ endif }} - @@ -13,11 +11,19 @@ - - {{ if $nav.register }}$nav.register.1{{ endif }} - + diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 6e52c888fd..9f4d54c67c 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1157,7 +1157,7 @@ input#dfrn-url { display: none; z-index: 10000; } -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none } .wall-item-photo-menu li a { display: block; padding: 2px; } .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } @@ -1177,7 +1177,7 @@ input#dfrn-url { height: 30px !important; } -.wallwall .wall-item-photo-end { +.wallwall /*.wall-item-photo-end*/ { clear: both; } @@ -1267,18 +1267,18 @@ input#dfrn-url { float: right; } -.wall-item-delete-end { +/*.wall-item-delete-end { clear: both; -} +}*/ .wall-item-delete-icon { border: none; } -.wall-item-wrapper-end { +/*.wall-item-wrapper-end { clear: both; -} +}*/ .wall-item-name-link { font-weight: bold; text-decoration: none; @@ -1311,9 +1311,9 @@ input#dfrn-url { /*width: 450px;*/ } -.wall-item-title-end { +/*.wall-item-title-end { clear: both; -} +}*/ .wall-item-body { text-align: justify; @@ -1357,6 +1357,7 @@ input#dfrn-url { } .comment-wwedit-wrapper { + display: block; margin-top: 15px; background: #f3f3f3; margin-left: 50px; diff --git a/view/theme/frost/wall_item.tpl b/view/theme/frost/wall_item.tpl index 60dde76000..68950f4911 100644 --- a/view/theme/frost/wall_item.tpl +++ b/view/theme/frost/wall_item.tpl @@ -1,5 +1,5 @@ -
+
menu -
-
    + +
      $item.item_photo_menu
    -
+
-
+
- {{ if $item.lock }}
$item.lock
+ {{ if $item.lock }}$item.lock {{ else }}
{{ endif }}
$item.location
-
+ $item.name
$item.ago
-
+
$item.title
-
+
$item.body -
+ {{ for $item.tags as $tag }} - $tag + $tag {{ endfor }} -
+
@@ -48,7 +48,7 @@
{{ endif }} {{ if $item.plink }} - + {{ endif }} {{ if $item.edpost }} @@ -61,19 +61,19 @@ {{ if $item.filer }} {{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
+ + {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }} -
+
-
+
$item.like
$item.dislike
-
+ $item.comment -
+ -
- + + diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl new file mode 100644 index 0000000000..c1b2820e40 --- /dev/null +++ b/view/theme/frost/wallwall_item.tpl @@ -0,0 +1,86 @@ + + +
+
+
+ + $item.owner_name +
+
$item.wall
+
+ + $item.name + menu + +
    + $item.item_photo_menu +
+ + +
+ +
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
$item.location
+
+
+ + $item.name $item.to $item.owner_name $item.vwall
+
$item.ago
+ +
+
$item.title
+ +
$item.body + + {{ for $item.tags as $tag }} + $tag + {{ endfor }} + +
+
+
+ {{ if $item.vote }} + + {{ endif }} + {{ if $item.plink }} + + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} + + {{ if $item.star }} + + + {{ endif }} + {{ if $item.filer }} + + {{ endif }} + + + {{ if $item.drop.dropping }}{{ endif }} + + {{ if $item.drop.dropping }}{{ endif }} + +
+
+ +
$item.like
+
$item.dislike
+
+ + $item.comment + + + + +