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') 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') 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') 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') 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') 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/css/widgets.css | 8 +++++++- view/tpl/group_side.tpl | 14 ++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 5176c6934..cb976e166 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -81,10 +81,16 @@ /* group */ +input.group-edit-checkbox { + margin: unset; +} + +a.group-edit-link { + z-index: 1; +} .group-edit-icon { opacity: 0; - z-index: 1; } li:hover .group-edit-icon { 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 8406046c5b3ac8539535d46b9099b46586203fb8 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 13 Oct 2014 11:58:49 +0200 Subject: fix connedit > collection > checkbox position also for webkit - this will need a better solution though --- view/css/widgets.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index cb976e166..1992aa0fd 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -83,6 +83,8 @@ /* group */ input.group-edit-checkbox { margin: unset; + height: 1em; + width: 1em; } a.group-edit-link { -- 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/php/theme_init.php | 2 +- view/tpl/msg-header.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f1eaded6a..baa83f25f 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -28,7 +28,7 @@ head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js'); head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); -head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); +//head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); 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') 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/css/conversation.css | 6 +--- view/css/mod_photos.css | 23 +++--------- view/theme/redbasic/css/style.css | 6 ++++ view/theme/redbasic/php/style.php | 2 +- view/tpl/album_edit.tpl | 9 ++++- view/tpl/photos_upload.tpl | 76 +++++++++++++++++++++------------------ 6 files changed, 61 insertions(+), 61 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 6c9d757b1..959047779 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -127,10 +127,6 @@ a.wall-item-name-link { font-size: 1.112em; } -.wall-item-content img { - max-width: 95%; -} - .wall-item-title h3 { font-weight: bold; margin: 0px; @@ -262,4 +258,4 @@ a.wall-item-name-link { .item-forged { color: #FF0000; font-size: 1.5em !important; -} \ No newline at end of file +} diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index ed3e2ac26..3832ea1a6 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -9,8 +9,8 @@ } #photo-photo { - display: table; - margin: 0 auto; + display: table; + margin: 0 auto; } #photo-photo-end { @@ -22,27 +22,12 @@ margin-bottom: 25px; } -#photos-upload-newalbum-div { - float: left; - width: 175px; -} - #photos-upload-noshare { margin-bottom: 10px; } -#photos-upload-existing-album-text { - float: left; - width: 175px; -} -#photos-upload-newalbum { - float: left; -} -#photos-upload-album-select { - float: left; -} - -#photos-upload-spacer { +#photos-upload-spacer, +#photos-upload-new-end { margin-top: 25px; } #photos-upload-new-end, #photos-upload-exist-end { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e62949520..31b769460 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2341,6 +2341,12 @@ aside .nav-pills > li > a { margin-right: 10px; } +.section-content-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; +} @media screen and (max-width: 767px) { aside#region_1 { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 045ddc309..55b35af4b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -226,7 +226,7 @@ if(! $a->install) { if (! $input_linksubmit) $input_linksubmit = "#0080FF"; if (! $input_border) - $input_border = "#666"; + $input_border = "#ccc"; if (! $input_colourhover) $input_colourhover = "#333"; if (! $input_decohover) 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 4495a30b88a08915e817011076f2095533c903eb Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 30 Oct 2014 18:55:24 +0100 Subject: removing this was not a good idea... --- view/css/conversation.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 959047779..1e9930443 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -127,6 +127,10 @@ a.wall-item-name-link { font-size: 1.112em; } +.wall-item-content img { + max-width: 100%; +} + .wall-item-title h3 { font-weight: bold; margin: 0px; -- 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/css/mod_photos.css | 15 ++++---------- view/css/widgets.css | 3 --- view/theme/redbasic/css/style.css | 10 ++++++---- view/tpl/photos_upload.tpl | 41 +++++++++++++++++++++++++-------------- 4 files changed, 36 insertions(+), 33 deletions(-) (limited to 'view') diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 3832ea1a6..89041bd09 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -22,24 +22,16 @@ margin-bottom: 25px; } -#photos-upload-noshare { - margin-bottom: 10px; +#photos-upload-album { + width: 100%; } -#photos-upload-spacer, -#photos-upload-new-end { - margin-top: 25px; -} #photos-upload-new-end, #photos-upload-exist-end { clear: both; } #photos-upload-exist-end { margin-bottom: 15px; } -#photos-upload-submit { - margin-top: 15px; -} - #photos-upload-select-files-text { margin-top: 15px; @@ -63,8 +55,9 @@ margin-bottom: 15px; } -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end, #photos-upload-perms-end, #photos-upload-noshare-end{ clear: both; + margin-bottom: 10px; } #photo-edit-rotate-end { diff --git a/view/css/widgets.css b/view/css/widgets.css index 593e051da..df113b12e 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -26,9 +26,6 @@ /* search */ #search-text { - border: 1px solid #ccc; - padding: 5px; - line-height: 1.5; border-top-right-radius: 0px; border-bottom-right-radius: 0px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 31b769460..5ffc33d31 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -13,7 +13,7 @@ html { } body { - font-family: arial,freesans,sans-serif; + font-family: sans-serif, arial, freesans; font-size: $body_font_size; background-color: $bgcolour; background-image: url('$background_image'); @@ -37,7 +37,7 @@ h5, .h5, h6, .h6 { } .jslider { - font-family: arial,freesans,sans-serif; + font-family: sans-serif, arial, freesans; } abbr { @@ -84,17 +84,19 @@ a.btn-success { input[type="text"], input[type="password"], input[type="submit"], +input[type="file"], select, textarea { - font-family: arial,freesans,sans-serif; + font-family: sans-serif, arial, freesans; font-size: $body_font_size; } input { + padding: 5px; + line-height: 1.5; border: 1px solid $input_border; -moz-border-radius: $radiuspx; border-radius: $radiuspx; - padding: 3px; } input[type="submit"] { 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') 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/css/mod_photos.css | 5 ++--- view/theme/redbasic/css/style.css | 14 +++++--------- 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 +++--------- 8 files changed, 18 insertions(+), 31 deletions(-) (limited to 'view') diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 89041bd09..061f2f40a 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -66,10 +66,9 @@ #photo-edit-edit, -#photo-album-edit-wrapper { +#photo-album-edit-wrapper, +#photo-upload-form { display: none; - padding: 7px 10px; - margin-bottom: 3px; } #photo-album-edit-submit, #photo-album-edit-drop { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5ffc33d31..114098465 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -706,9 +706,7 @@ footer { cursor: pointer; } -#photo-album-edit-wrapper, -#photo-view-wrapper, -#photo-edit-edit { +#photo-view-wrapper { background-color: $item_colour; } @@ -2335,12 +2333,10 @@ aside .nav-pills > li > a { margin-bottom: 0px; } -.section-title-submenu { - margin-top: 10px; -} - -.section-title-submenu a { - margin-right: 10px; +.section-content-tools-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + margin-bottom: 3px; } .section-content-wrapper { 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