From 711719ce0ce340fbcda7559bf20582e85e4b1e3d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 May 2014 12:01:12 -0700 Subject: Made some changes to img tags to enforce max-width everywhere, and to the page headers to allow user scaling. --- view/tpl/head.tpl | 2 +- view/tpl/photo_view.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index e7b41523f..54aa5d41c 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ - + + + + {{$head_css}} {{$js_strings}} -- cgit v1.2.3 From d1e0479f58e32c63160c7ad9dbd0c1c2363a1b6c Mon Sep 17 00:00:00 2001 From: root Date: Sat, 10 May 2014 11:35:16 -0700 Subject: Removed some unnecessary changes. --- view/tpl/head.tpl | 2 +- view/tpl/photo_view.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 496758079..a212fd486 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ - + -- cgit v1.2.3 From 077b97eac46989cfc7aadc14f3c4974fb31473b3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 15 May 2014 19:54:37 -0700 Subject: the app menu takes form --- view/tpl/apps.tpl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl index 335e0ca97..4a5ddfbcb 100755 --- a/view/tpl/apps.tpl +++ b/view/tpl/apps.tpl @@ -1,7 +1,11 @@

{{$title}}

-
    - {{foreach $apps as $ap}} -
  • {{$ap}}
    • - {{/foreach}} -
+{{foreach $apps as $ap}} +
+ +
{{$ap.name}}
+ +
+{{/foreach}} +
+ -- cgit v1.2.3 From 2fdc13e91d3b0ccd514a13fd7f475f045656b23f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 15 May 2014 20:20:20 -0700 Subject: some sidebar content (doesn't yet do anything) --- view/tpl/app_select.tpl | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 view/tpl/app_select.tpl (limited to 'view/tpl') diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl new file mode 100644 index 000000000..9613b4976 --- /dev/null +++ b/view/tpl/app_select.tpl @@ -0,0 +1,10 @@ +
+

{{$title}}

+ +
+ -- cgit v1.2.3 From 659714956ccce13b7055d5bf265be07cf4b79cfa Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 15 May 2014 20:58:26 -0700 Subject: add hover tips - except we need a way to translate the things --- view/tpl/apps.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl index 4a5ddfbcb..02a6bd047 100755 --- a/view/tpl/apps.tpl +++ b/view/tpl/apps.tpl @@ -2,7 +2,7 @@ {{foreach $apps as $ap}}
- +
{{$ap.name}}
-- cgit v1.2.3 From 89b8bc07ac7178b8ea722f8d1faa2f649faa8c1b Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 18 May 2014 09:14:21 +0200 Subject: implement modal for more then 10 likes/dislikes --- view/tpl/conv_item.tpl | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index f9be3b077..ee10b6633 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -103,16 +103,60 @@ {{if $item.like_count}}
+ {{if $item.like_list_part}} + + {{else}} + {{/if}}
{{/if}} {{if $item.dislike_count}}
+ {{if $item.dislike_list_part}} + + {{else}} + {{/if}}
{{/if}} + {{if $item.like_list_part}} + + {{/if}} + {{if $item.dislike_list_part}} + + {{/if}} {{* we dont' use this do we? {{if $item.drop.pagedrop}} -- cgit v1.2.3 From 6d01707a724504a34b8e84e87c6601a046de9739 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 19 May 2014 16:49:11 -0700 Subject: more app backend work --- view/tpl/app.tpl | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 view/tpl/app.tpl (limited to 'view/tpl') diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl new file mode 100644 index 000000000..30287b044 --- /dev/null +++ b/view/tpl/app.tpl @@ -0,0 +1,6 @@ +
+ +
{{$ap.name}}
+ +
+ -- cgit v1.2.3 From c530a7a9366b1c89a63fc1782ec620db992efc3b Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 20 May 2014 17:33:06 +0200 Subject: some work on comment_item.tpl --- view/tpl/comment_item.tpl | 88 ++++++++++++++++++++++------------------------- view/tpl/conv_item.tpl | 4 ++- 2 files changed, 44 insertions(+), 48 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 1ea619774..598c0d58e 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,44 +10,7 @@ - -
- {{$mytitle}} -
-
-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • - {{if $feature_encrypt}} -
    • - {{/if}} -
-
- + {{if $qcomment}} {{/if}} - -
- diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index ee10b6633..fe54ac377 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -174,9 +174,11 @@ {{/foreach}} {{/if}} {{if $item.comment}} -
+
{{$item.comment}}
+
+
{{/if}}
{{if $item.comment_lastcollapsed}} -- cgit v1.2.3 From 1aa7f3136f336a66220aae28f1404e2e2a4ecd39 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 20 May 2014 19:16:05 +0200 Subject: the js seems to interfere with something else... comment out for now... --- view/tpl/comment_item.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 598c0d58e..121cf0995 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -53,12 +53,12 @@ {{/if}}
- {{if $preview}} - - {{/if}} - + {{if $preview}} + + {{/if}} +
-- cgit v1.2.3 From fc0967b84b5e1301c0ce3a9a41c00985ce16bc82 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 May 2014 18:08:49 -0700 Subject: most of the remaining apps basic infrastructure except a form to create the things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now. --- view/tpl/app.tpl | 11 +++++++++-- view/tpl/app_select.tpl | 4 +--- view/tpl/myapps.tpl | 9 +++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100755 view/tpl/myapps.tpl (limited to 'view/tpl') diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 30287b044..323dfbe63 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,6 +1,13 @@
- -
{{$ap.name}}
+ +
{{$app.name}}
 +{{if $install || $update || $delete }} +
+ +{{if $install}}{{/if}} +{{if $delete}}{{/if}} +
+{{/if}}
diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index 9613b4976..d6eb2c31a 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -1,10 +1,8 @@

{{$title}}

diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl new file mode 100755 index 000000000..1a591f9f8 --- /dev/null +++ b/view/tpl/myapps.tpl @@ -0,0 +1,9 @@ +

{{$title}}

+ +{{foreach $apps as $ap}} +
+{{$ap}} +
+{{/foreach}} +
+ -- cgit v1.2.3 From cad481d94fb8cfb350e931620c788f1a2a47a994 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 May 2014 21:22:19 -0700 Subject: unfinished work for creating app --- view/tpl/app_create.tpl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 view/tpl/app_create.tpl (limited to 'view/tpl') diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl new file mode 100644 index 000000000..540effe75 --- /dev/null +++ b/view/tpl/app_create.tpl @@ -0,0 +1,26 @@ +

{{$banner}}

+ + +
+{{if $guid}} + +{{/if}} +{{if $author}} + +{{/if}} +{{if $addr}} + +{{/if}} + +{{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$url}} +{{include file="field_input.tpl" field=$desc}} +{{include file="field_input.tpl" field=$photo}} +{{include file="field_input.tpl" field=$version}} +{{include file="field_input.tpl" field=$price}} +{{include file="field_input.tpl" field=$page}} + + + +
+ -- cgit v1.2.3 From 5d9f924642872e30c83ac0de4807e0beb2c15011 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 May 2014 22:25:36 -0700 Subject: more app work --- view/tpl/app.tpl | 4 ++-- view/tpl/app_create.tpl | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 323dfbe63..1d39395d6 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -5,8 +5,8 @@ {{if $install || $update || $delete }}
-{{if $install}}{{/if}} -{{if $delete}}{{/if}} +{{if $install}}{{/if}} +{{if $delete}}{{/if}}
{{/if}} diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl index 540effe75..ff28e0598 100644 --- a/view/tpl/app_create.tpl +++ b/view/tpl/app_create.tpl @@ -14,12 +14,16 @@ {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$url}} -{{include file="field_input.tpl" field=$desc}} +{{include file="field_textarea.tpl" field=$desc}} {{include file="field_input.tpl" field=$photo}} {{include file="field_input.tpl" field=$version}} {{include file="field_input.tpl" field=$price}} {{include file="field_input.tpl" field=$page}} +{{if $embed}} +{{include file="field_textarea.tpl" field=$embed}} +{{/if}} + -- cgit v1.2.3 From 77ca117218382b57e2d0590466d9fc38dc016e80 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 May 2014 01:55:32 -0700 Subject: make it possible to edit/delete apps via /apps/personal/edit --- view/tpl/app.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 1d39395d6..e375bd013 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,5 +1,5 @@
- +
{{$app.name}}
 {{if $install || $update || $delete }} -- cgit v1.2.3 From d17768d4e7b7f07dfd2f4326f79fa8b1f9a74582 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 May 2014 17:23:34 -0700 Subject: change app dropdown to point to apps module (changes nav template). Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content. --- view/tpl/nav.tpl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5aa3b0f01..6b76ff5b6 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -157,13 +157,8 @@ {{/if}} {{if $nav.apps}} -
  • +
    • {{/if}} -- cgit v1.2.3 From 751fda97045ad4e399e9a01cc14d8eb058b361a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 May 2014 20:54:09 -0700 Subject: more app work --- view/tpl/app.tpl | 6 +++++- view/tpl/app_select.tpl | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index e375bd013..967ccc67c 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,11 +1,15 @@
    - +
    {{$app.name}}
     +{{if $purchase}} + +{{/if}} {{if $install || $update || $delete }}
    {{if $install}}{{/if}} +{{if $edit}}{{/if}} {{if $delete}}{{/if}}
    {{/if}} diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index d6eb2c31a..4cd945388 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -3,6 +3,9 @@
    -- cgit v1.2.3 From 059b6cd411e7034bd6b1b6de02dc34984259bd11 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 23 May 2014 15:30:22 -0700 Subject: add randprof app and do away with the universally hated chanview-iframe mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix. --- view/tpl/apps.tpl | 2 +- view/tpl/settings_display.tpl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl index 02a6bd047..d8e538cb7 100755 --- a/view/tpl/apps.tpl +++ b/view/tpl/apps.tpl @@ -2,7 +2,7 @@ {{foreach $apps as $ap}}
    - +
    {{$ap.name}}
    diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 924b4b33f..a2038b930 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -9,7 +9,6 @@ {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} -{{include file="field_checkbox.tpl" field=$chanview_full}}
    -- cgit v1.2.3 From bf88720fae18f0ffc2824cf94c262e5dc9c907ec Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 24 May 2014 17:50:09 +0200 Subject: possible fix for empty commentbox colapsing on tool-button click --- view/tpl/comment_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 121cf0995..7d7b22f74 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,7 +10,7 @@ - + {{if $qcomment}} - + {{if $qcomment}} - + {{if $qcomment}} -- cgit v1.2.3 From 810515f1a10082ac7bc75550089ce9c40b44b003 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 May 2014 22:42:07 -0700 Subject: auto-highlight app embed code on click --- view/tpl/field_textarea.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 98be8f138..b454045c0 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@
    - + {{$field.3}}
    -- cgit v1.2.3 From 88bedec56c4c08988b6536e0e312ecfd883001bf Mon Sep 17 00:00:00 2001 From: 23n Date: Mon, 26 May 2014 18:50:54 +0200 Subject: divide autodate from item.app --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fe54ac377..0915172fb 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,7 +26,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    - {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
    -- cgit v1.2.3 From 83ffad4b9dac914d9d4a5a9365ee23fb8f9d8483 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 26 May 2014 22:34:43 +0200 Subject: fix one more bootstrap override regression --- view/tpl/comment_item.tpl | 2 +- view/tpl/jot.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 0b89bb16a..13c827b77 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -54,7 +54,7 @@
    {{if $preview}} - {{/if}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 2fd24d5ff..c4fdba0f5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -81,7 +81,7 @@ {{/if}} {{if $preview}} - {{/if}} -- cgit v1.2.3 From c0e1139a46c851845cb90f8df0b2f932df78a886 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 27 May 2014 16:44:18 +0200 Subject: some fixes and cleanup --- view/tpl/conv_item.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 0915172fb..bf371b05c 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -6,9 +6,9 @@ {{/if}}
    -
    +
    -
    +
    {{$item.name}}
    -- cgit v1.2.3