From 2ddd022540a5212fa61a912becd3bacdf1ab6a7b Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sat, 11 Oct 2014 14:39:56 +0000 Subject: +1 --- view/tpl/viewcontact_template.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index 18fed6bb4..cde24525c 100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,3 +1,4 @@ +

{{$title}}

{{foreach $contacts as $contact}} @@ -5,5 +6,5 @@ {{/foreach}}
- {{$paginate}} +
-- cgit v1.2.3 From d132646915a3cf500215e7323b29a3e26670be10 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 11 Oct 2014 15:42:31 +0100 Subject: Unbreak webpages --- view/tpl/webpagelist.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 85c4b723e..8d93460ae 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,3 +1,4 @@ +{{$listtitle}} {{if $pages}}
-- cgit v1.2.3 From 2b472b2b487cc78cf0bdcc5a885f62afbddeb036 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 11 Oct 2014 15:45:00 +0100 Subject: Give Redbasic the -styled back --- view/tpl/webpagelist.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 8d93460ae..acb132521 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,7 +1,7 @@ {{$listtitle}} {{if $pages}} -
+
{{foreach $pages as $key => $items}} -- cgit v1.2.3 From d196e71962f8e9d6ec76250340f2252ef97ff6ce Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 11 Oct 2014 15:48:30 +0100 Subject: Also that doesn't work anymore - prettyPhoto relic --- view/tpl/webpagelist.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index acb132521..8335ebd62 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -10,7 +10,7 @@
{{$actions_txt}}{{$pagelink_txt}}{{$title_txt}}{{$created_txt}}{{$edited_txt}}
{{if $edit}} {{/if}} {{if $view}} {{/if}} - {{if $preview}} {{/if}} + {{if $preview}} {{/if}} {{if $view}}{{$item.pagetitle}} -- cgit v1.2.3 From 82232c6916ba6a657bbae524ada3c4ba21001156 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 11 Oct 2014 17:24:58 +0100 Subject: Show tag in siteinfo. Not useful for us, quite useful for admins. --- view/tpl/siteinfo.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index d956a7228..a6105227e 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -4,6 +4,9 @@ {{if $version}}

{{$version}}{{if $commit}}+{{$commit}}{{/if}}

{{/if}} +{{if $tag}} +

Tag: {{$tag}}

+{{/if}}

{{$web_location}}

{{$visit}}

{{$bug_text}} {{$bug_link_text}}

-- cgit v1.2.3 From 030175bde68d510af543f739954d817d94c898ce Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 12 Oct 2014 14:31:51 +0200 Subject: fix connedit > collection > checkbox position --- view/tpl/group_side.tpl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 3701f979e..6c5edba27 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -5,14 +5,16 @@ {{foreach $groups as $group}}
  • {{if $group.cid}} - + + + {{/if}} {{if $group.edit}} - + {{/if}} {{$group.text}}
    • -- cgit v1.2.3 From 7abaccaf7fc539216ff3a3395a3e280c4517a054 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 13 Oct 2014 03:07:36 -0700 Subject: bring back PM upload functionality and why oh why are we still loading tinymce? --- view/tpl/msg-header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index b6cff7c74..503e4c8cc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -49,7 +49,7 @@ else - - - - diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@
    - + - + {{if $edit.albums}} {{foreach $edit.albums as $al}} @@ -47,18 +47,18 @@ {{/if}}
    - +
    - +
    {{$edit.rotatecw}}
    {{$edit.rotateccw}}
    -
    - +
    +
    @@ -69,8 +69,8 @@

    - - + +
    -- cgit v1.2.3 From ec8bab7784b531299150ddb2c18ede40d5c5df6c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 28 Oct 2014 11:56:00 +0100 Subject: change the way tagrm works to allow tag removal on the fly --- view/tpl/photo_view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 54e15de74..c79cd7d56 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -85,7 +85,7 @@
    {{$tag_hdr}} {{foreach $tags as $t}} - {{$t.0}}{{if $edit}}  {{/if}} + {{$t.0}}{{if $edit}}  {{/if}} {{/foreach}}
    {{/if}} -- cgit v1.2.3 From 0ff4d9015b3b06412e84f6fbc32ae4e78e16d6ae Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 30 Oct 2014 14:10:55 +0100 Subject: some work on photo upload --- view/tpl/album_edit.tpl | 9 +++++- view/tpl/photos_upload.tpl | 76 +++++++++++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 36 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index 84a47378b..a65887d3c 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -3,7 +3,14 @@ - + + + {{foreach $albums as $al}} + {{if $al.text}} +
    diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 81d7b6dc0..3db292f02 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,44 +1,50 @@ -
    -
    {{$usage}}
    -

    {{$pagename}}

    -
    -
    - -
    -
    - -
    -
    - -
    - -
    -
    -
    -
    {{$existalbumtext}}
    - {{$albumselect}} +
    +
    +
    {{$usage}}
    +

    {{$pagename}}

    +
    -
    -
    - - -
    +
    + + +
    + +
    +
    + + + {{foreach $albums as $al}} + {{if $al.text}} + +
    +
    -
    - - -
    - {{$aclselect}} -
    +
    + + +
    -
    +
    + + +
    - {{$uploader}} + {{$aclselect}} - {{$default}} +
    -
    - +
    + + {{$uploader}} + + {{$default}} + +
    + +
    -- cgit v1.2.3 From 2982212797dd64e1be13de20dc158842734ee5f8 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 31 Oct 2014 14:33:41 +0100 Subject: more work on photo upload --- view/tpl/photos_upload.tpl | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 3db292f02..4c53a7c62 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -8,11 +8,11 @@
    -
    - -
    -
    - + + +
    + + {{foreach $albums as $al}} {{if $al.text}} @@ -22,27 +22,38 @@
    + {{$aclselect}} + + {{if $default}} +
    + +
    +
    + + +
    + {{/if}} +
    -
    - - +
    +
    + {{if $uploader}} +
    - - {{$aclselect}} -
    - -
    - {{$uploader}} + {{/if}} - {{$default}}
    -- cgit v1.2.3 From 5d1bb1b6854b4601eedaa9d39a40832b29d434e5 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 31 Oct 2014 16:09:46 +0000 Subject: Smarty3 now lives in store --- view/tpl/smarty3/README | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 view/tpl/smarty3/README (limited to 'view/tpl') diff --git a/view/tpl/smarty3/README b/view/tpl/smarty3/README deleted file mode 100644 index 78ff8d9a1..000000000 --- a/view/tpl/smarty3/README +++ /dev/null @@ -1,4 +0,0 @@ -view/tpl/smarty3 - -This directory must exist and be writeable by the webserver in order to store compiled template files, which are created dynamically. Please see the installation instructions. - -- cgit v1.2.3 From 5d151b988605bc5aedbef65b687a43dedbc574e9 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 31 Oct 2014 20:25:43 +0100 Subject: do not reload page for photo upload --- view/tpl/album_edit.tpl | 2 +- view/tpl/photo_album.tpl | 3 ++- view/tpl/photo_albums.tpl | 8 ++------ view/tpl/photo_view.tpl | 2 +- view/tpl/photos_recent.tpl | 3 ++- view/tpl/photos_upload.tpl | 12 +++--------- 6 files changed, 11 insertions(+), 19 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index a65887d3c..a6815352a 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0a26fc367..2c0b8e5b9 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -5,13 +5,14 @@ {{/if}} {{if $can_post}} -  {{$upload.0}} + {{/if}}

    {{$album}}

    +{{$upload_form}} {{$album_edit.1}}
    {{foreach $photos as $photo}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 0f8b809ac..de1105bbc 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,17 +1,13 @@ diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index c79cd7d56..d1b077f36 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -31,7 +31,7 @@
    -
    +
    diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 91b088c93..7727abcea 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,10 +1,11 @@
    {{if $can_post}} -  {{$upload.0}} + {{/if}}

    {{$title}}

    +{{$upload_form}}
    {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 4c53a7c62..5bb0092d6 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,18 +1,12 @@ -
    -
    -
    {{$usage}}
    -

    {{$pagename}}

    -
    -
    - -
    +
    +
    - + {{foreach $albums as $al}} {{if $al.text}} -- cgit v1.2.3