From c1c83115aded668f37418f8c965d4d09670cacb1 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sun, 10 Feb 2013 10:21:52 -0700 Subject: [PATCH] Update Frost-mobile to v0.3 --- view/theme/frost-mobile/contact_edit.tpl | 4 +- view/theme/frost-mobile/conversation.tpl | 6 +- view/theme/frost-mobile/default.php | 2 +- view/theme/frost-mobile/end.tpl | 18 +- .../frost-mobile/generic_links_widget.tpl | 5 +- view/theme/frost-mobile/head.tpl | 13 +- view/theme/frost-mobile/jot-header.tpl | 3 +- view/theme/frost-mobile/jot.tpl | 10 +- view/theme/frost-mobile/js/acl.js | 2 +- view/theme/frost-mobile/js/acl.min.js | 2 +- view/theme/frost-mobile/js/main.js | 26 +- view/theme/frost-mobile/js/main.min.js | 2 +- view/theme/frost-mobile/js/theme.js | 646 +++++++++--------- view/theme/frost-mobile/js/theme.min.js | 2 +- view/theme/frost-mobile/login-style.css | 2 +- view/theme/frost-mobile/login_head.tpl | 2 +- view/theme/frost-mobile/mail_conv.tpl | 2 +- view/theme/frost-mobile/msg-header.tpl | 3 +- view/theme/frost-mobile/nav.tpl | 36 +- view/theme/frost-mobile/photo_edit.tpl | 23 +- view/theme/frost-mobile/settings.tpl | 4 +- .../frost-mobile/smarty3/contact_edit.tpl | 4 +- .../frost-mobile/smarty3/conversation.tpl | 6 +- view/theme/frost-mobile/smarty3/end.tpl | 18 +- .../smarty3/generic_links_widget.tpl | 5 +- view/theme/frost-mobile/smarty3/head.tpl | 13 +- .../theme/frost-mobile/smarty3/jot-header.tpl | 3 +- view/theme/frost-mobile/smarty3/jot.tpl | 10 +- .../theme/frost-mobile/smarty3/login_head.tpl | 2 +- view/theme/frost-mobile/smarty3/mail_conv.tpl | 2 +- .../theme/frost-mobile/smarty3/msg-header.tpl | 3 +- view/theme/frost-mobile/smarty3/nav.tpl | 36 +- .../theme/frost-mobile/smarty3/photo_edit.tpl | 23 +- view/theme/frost-mobile/smarty3/settings.tpl | 4 +- .../smarty3/threaded_conversation.tpl | 4 +- .../frost-mobile/smarty3/wall_thread.tpl | 52 +- .../frost-mobile/smarty3/wallmsg-end.tpl | 5 +- .../frost-mobile/smarty3/wallmsg-header.tpl | 3 +- view/theme/frost-mobile/style.css | 515 +++++++++----- view/theme/frost-mobile/theme.php | 2 +- .../frost-mobile/threaded_conversation.tpl | 4 +- view/theme/frost-mobile/wall_thread.tpl | 52 +- view/theme/frost-mobile/wallmsg-end.tpl | 5 +- view/theme/frost-mobile/wallmsg-header.tpl | 3 +- 44 files changed, 885 insertions(+), 702 deletions(-) diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl index d4bd41d74b..e5f12950c7 100644 --- a/view/theme/frost-mobile/contact_edit.tpl +++ b/view/theme/frost-mobile/contact_edit.tpl @@ -6,7 +6,7 @@ $tab_str @@ -74,7 +74,7 @@

$lbl_info1

- +
diff --git a/view/theme/frost-mobile/conversation.tpl b/view/theme/frost-mobile/conversation.tpl index 54ddafbb1d..d39976f39f 100644 --- a/view/theme/frost-mobile/conversation.tpl +++ b/view/theme/frost-mobile/conversation.tpl @@ -20,10 +20,10 @@ $live_update
- -{{ endif }} +
+{{ endif }}-->#} diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php index 7a8a0494de..ad464760f7 100644 --- a/view/theme/frost-mobile/default.php +++ b/view/theme/frost-mobile/default.php @@ -27,7 +27,7 @@
- module === 'settings') && x($page,'aside')) echo $page['aside']; ?> + module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl index d2679935c9..8bc088421a 100644 --- a/view/theme/frost-mobile/end.tpl +++ b/view/theme/frost-mobile/end.tpl @@ -1,18 +1,22 @@ - - +-->#} + + + - - - +{##} +{##} + + + diff --git a/view/theme/frost-mobile/generic_links_widget.tpl b/view/theme/frost-mobile/generic_links_widget.tpl index 3783467215..a976d4573c 100644 --- a/view/theme/frost-mobile/generic_links_widget.tpl +++ b/view/theme/frost-mobile/generic_links_widget.tpl @@ -1,11 +1,12 @@
- +{##} {{if $desc}}
$desc
{{endif}} -
    +
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl index edfa5e4bbf..a79b2916dd 100644 --- a/view/theme/frost-mobile/head.tpl +++ b/view/theme/frost-mobile/head.tpl @@ -1,15 +1,15 @@ - +-->#} - +{##} - +-->#} @@ -28,7 +28,4 @@ var updateInterval = $update_interval; var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }}; - - - diff --git a/view/theme/frost-mobile/jot-header.tpl b/view/theme/frost-mobile/jot-header.tpl index b7aafc5ed9..5d8cfa4548 100644 --- a/view/theme/frost-mobile/jot-header.tpl +++ b/view/theme/frost-mobile/jot-header.tpl @@ -11,7 +11,8 @@ window.term = "$term"; window.baseURL = "$baseurl"; window.geoTag = function () { $geotag } - window.ajaxType = 'jot-header'; + window.jotId = "#profile-jot-text"; + window.imageUploadButton = 'wall-image-upload'; diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl index d28cf57e48..b345152792 100644 --- a/view/theme/frost-mobile/jot.tpl +++ b/view/theme/frost-mobile/jot.tpl @@ -21,7 +21,7 @@
{{ endif }}
- + {##}
@@ -39,8 +39,10 @@
-