From: Zach Prezkuta Date: Sun, 10 Feb 2013 21:57:44 +0000 (-0700) Subject: update to Frost v0.4 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4d8678e523111d181bd52de087cf77e9c933fd76;p=friendica.git update to Frost v0.4 --- diff --git a/view/theme/frost/contact_edit.tpl b/view/theme/frost/contact_edit.tpl new file mode 100644 index 0000000000..f5710063a2 --- /dev/null +++ b/view/theme/frost/contact_edit.tpl @@ -0,0 +1,88 @@ + +

$header

+ +
+ + $tab_str + + + + + + +
+ +
+
+ + +
+ + + {{ if $poll_enabled }} +
+
$lastupdtext $last_update
+ $updpub $poll_interval $udnow +
+ {{ endif }} +
+ + {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} + +
+

$lbl_info1

+ + +
+
+ + +
+

$lbl_vis1

+

$lbl_vis2

+
+$profile_select +
+ + + +
+
diff --git a/view/theme/frost/contact_end.tpl b/view/theme/frost/contact_end.tpl index b6bcac295f..95c78ba7da 100644 --- a/view/theme/frost/contact_end.tpl +++ b/view/theme/frost/contact_end.tpl @@ -1,6 +1,2 @@ - - + diff --git a/view/theme/frost/contact_head.tpl b/view/theme/frost/contact_head.tpl index e69de29bb2..7b89a20e71 100644 --- a/view/theme/frost/contact_head.tpl +++ b/view/theme/frost/contact_head.tpl @@ -0,0 +1,4 @@ + + diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl index eadf480bea..c88426bbf4 100644 --- a/view/theme/frost/end.tpl +++ b/view/theme/frost/end.tpl @@ -1,20 +1,25 @@ - --->#} + + + - - - +{##} + + + + diff --git a/view/theme/frost/event.tpl b/view/theme/frost/event.tpl new file mode 100644 index 0000000000..67de85d5c8 --- /dev/null +++ b/view/theme/frost/event.tpl @@ -0,0 +1,10 @@ +{{ for $events as $event }} +
+ + {{ if $event.item.author_name }}$event.item.author_name{{ endif }} + $event.html + {{ if $event.item.plink }}{{ endif }} + {{ if $event.edit }}{{ endif }} +
+
+{{ endfor }} diff --git a/view/theme/frost/event_end.tpl b/view/theme/frost/event_end.tpl index ee9a6f6311..8e8dcd33ab 100644 --- a/view/theme/frost/event_end.tpl +++ b/view/theme/frost/event_end.tpl @@ -1,7 +1,5 @@ - + diff --git a/view/theme/frost/event_form.tpl b/view/theme/frost/event_form.tpl new file mode 100644 index 0000000000..36a22a8b2d --- /dev/null +++ b/view/theme/frost/event_form.tpl @@ -0,0 +1,50 @@ +

$title

+ +

+$desc +

+ +
+ + + + + +
$s_text
+$s_dsel $s_tsel + +
$f_text
+$f_dsel $f_tsel + +
+ +
$n_text
+ +
+ +
$a_text
+ +
+ +
$t_text
+ + + +
$d_text
+ + + +
$l_text
+ +
+ +
$sh_text
+
+ +$acl + +
+ +
+ + diff --git a/view/theme/frost/event_head.tpl b/view/theme/frost/event_head.tpl index c3f16d5428..44c6090fc1 100644 --- a/view/theme/frost/event_head.tpl +++ b/view/theme/frost/event_head.tpl @@ -2,5 +2,6 @@ diff --git a/view/theme/frost/group_drop.tpl b/view/theme/frost/group_drop.tpl new file mode 100644 index 0000000000..959b77bb21 --- /dev/null +++ b/view/theme/frost/group_drop.tpl @@ -0,0 +1,9 @@ +
+ +
+
diff --git a/view/theme/frost/head.tpl b/view/theme/frost/head.tpl index bb6e9e200b..3c25da46d0 100644 --- a/view/theme/frost/head.tpl +++ b/view/theme/frost/head.tpl @@ -2,7 +2,7 @@ - +{##} diff --git a/view/theme/frost/images/oxygen/LICENSE b/view/theme/frost/images/oxygen/LICENSE new file mode 100644 index 0000000000..65c5ca88a6 --- /dev/null +++ b/view/theme/frost/images/oxygen/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/view/theme/frost/images/oxygen/application-msword.png b/view/theme/frost/images/oxygen/application-msword.png new file mode 100644 index 0000000000..aa5aaf31a1 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-msword.png differ diff --git a/view/theme/frost/images/oxygen/application-pdf.png b/view/theme/frost/images/oxygen/application-pdf.png new file mode 100644 index 0000000000..bc954ff646 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-pdf.png differ diff --git a/view/theme/frost/images/oxygen/application-vnd.ms-excel.png b/view/theme/frost/images/oxygen/application-vnd.ms-excel.png new file mode 100644 index 0000000000..aa0d99597e Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.ms-excel.png differ diff --git a/view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png b/view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png new file mode 100644 index 0000000000..022b5152ed Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png differ diff --git a/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png new file mode 100644 index 0000000000..cb573b5c7c Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png differ diff --git a/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png new file mode 100644 index 0000000000..6b8030edd7 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png differ diff --git a/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png new file mode 100644 index 0000000000..1adb56e251 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png differ diff --git a/view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png b/view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png new file mode 100644 index 0000000000..d7dd1d1fb6 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png differ diff --git a/view/theme/frost/images/oxygen/application-x-compressed-tar.png b/view/theme/frost/images/oxygen/application-x-compressed-tar.png new file mode 100644 index 0000000000..adda685059 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-compressed-tar.png differ diff --git a/view/theme/frost/images/oxygen/application-x-deb.png b/view/theme/frost/images/oxygen/application-x-deb.png new file mode 100644 index 0000000000..1832d3b73a Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-deb.png differ diff --git a/view/theme/frost/images/oxygen/application-x-font-otf.png b/view/theme/frost/images/oxygen/application-x-font-otf.png new file mode 100644 index 0000000000..68fb5dd017 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-font-otf.png differ diff --git a/view/theme/frost/images/oxygen/application-x-font-ttf.png b/view/theme/frost/images/oxygen/application-x-font-ttf.png new file mode 100644 index 0000000000..93b92fb26f Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-font-ttf.png differ diff --git a/view/theme/frost/images/oxygen/application-x-java-archive.png b/view/theme/frost/images/oxygen/application-x-java-archive.png new file mode 100644 index 0000000000..4883b2d7ab Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-java-archive.png differ diff --git a/view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png b/view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png new file mode 100644 index 0000000000..6092aedd3e Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png differ diff --git a/view/theme/frost/images/oxygen/application-x-php.png b/view/theme/frost/images/oxygen/application-x-php.png new file mode 100644 index 0000000000..f133c87a2e Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-php.png differ diff --git a/view/theme/frost/images/oxygen/application-x-rar.png b/view/theme/frost/images/oxygen/application-x-rar.png new file mode 100644 index 0000000000..a9b1b12a64 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-rar.png differ diff --git a/view/theme/frost/images/oxygen/application-x-rpm.png b/view/theme/frost/images/oxygen/application-x-rpm.png new file mode 100644 index 0000000000..43149f17e4 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-rpm.png differ diff --git a/view/theme/frost/images/oxygen/application-x-ruby.png b/view/theme/frost/images/oxygen/application-x-ruby.png new file mode 100644 index 0000000000..e640ead732 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-ruby.png differ diff --git a/view/theme/frost/images/oxygen/application-x-shellscript.png b/view/theme/frost/images/oxygen/application-x-shellscript.png new file mode 100644 index 0000000000..11e27543f6 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-shellscript.png differ diff --git a/view/theme/frost/images/oxygen/application-x-shockwave-flash.png b/view/theme/frost/images/oxygen/application-x-shockwave-flash.png new file mode 100644 index 0000000000..ea9ca59ee9 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-shockwave-flash.png differ diff --git a/view/theme/frost/images/oxygen/application-x-tar.png b/view/theme/frost/images/oxygen/application-x-tar.png new file mode 100644 index 0000000000..4b7d023f79 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-tar.png differ diff --git a/view/theme/frost/images/oxygen/application-xml.png b/view/theme/frost/images/oxygen/application-xml.png new file mode 100644 index 0000000000..58d32e4384 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-xml.png differ diff --git a/view/theme/frost/images/oxygen/application-zip.png b/view/theme/frost/images/oxygen/application-zip.png new file mode 100644 index 0000000000..9d349a89a6 Binary files /dev/null and b/view/theme/frost/images/oxygen/application-zip.png differ diff --git a/view/theme/frost/images/oxygen/audio-aac.png b/view/theme/frost/images/oxygen/audio-aac.png new file mode 100644 index 0000000000..a2d5177d9a Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-aac.png differ diff --git a/view/theme/frost/images/oxygen/audio-mp4.png b/view/theme/frost/images/oxygen/audio-mp4.png new file mode 100644 index 0000000000..ae5fd740f6 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-mp4.png differ diff --git a/view/theme/frost/images/oxygen/audio-mpeg.png b/view/theme/frost/images/oxygen/audio-mpeg.png new file mode 100644 index 0000000000..5fe3a23594 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-mpeg.png differ diff --git a/view/theme/frost/images/oxygen/audio-x-flac.png b/view/theme/frost/images/oxygen/audio-x-flac.png new file mode 100644 index 0000000000..f2f11e8636 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-flac.png differ diff --git a/view/theme/frost/images/oxygen/audio-x-generic.png b/view/theme/frost/images/oxygen/audio-x-generic.png new file mode 100644 index 0000000000..fe7b052772 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-generic.png differ diff --git a/view/theme/frost/images/oxygen/audio-x-mp2.png b/view/theme/frost/images/oxygen/audio-x-mp2.png new file mode 100644 index 0000000000..5ac7909920 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-mp2.png differ diff --git a/view/theme/frost/images/oxygen/audio-x-ms-wma.png b/view/theme/frost/images/oxygen/audio-x-ms-wma.png new file mode 100644 index 0000000000..86cb3e51c8 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-ms-wma.png differ diff --git a/view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png b/view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png new file mode 100644 index 0000000000..5ac7909920 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png differ diff --git a/view/theme/frost/images/oxygen/audio-x-wav.png b/view/theme/frost/images/oxygen/audio-x-wav.png new file mode 100644 index 0000000000..101f8fe5b1 Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-wav.png differ diff --git a/view/theme/frost/images/oxygen/image-x-generic.png b/view/theme/frost/images/oxygen/image-x-generic.png new file mode 100644 index 0000000000..d1d4e256c8 Binary files /dev/null and b/view/theme/frost/images/oxygen/image-x-generic.png differ diff --git a/view/theme/frost/images/oxygen/text-css.png b/view/theme/frost/images/oxygen/text-css.png new file mode 100644 index 0000000000..119aec52cc Binary files /dev/null and b/view/theme/frost/images/oxygen/text-css.png differ diff --git a/view/theme/frost/images/oxygen/text-html.png b/view/theme/frost/images/oxygen/text-html.png new file mode 100644 index 0000000000..34768bfbe5 Binary files /dev/null and b/view/theme/frost/images/oxygen/text-html.png differ diff --git a/view/theme/frost/images/oxygen/text-x-generic-2.png b/view/theme/frost/images/oxygen/text-x-generic-2.png new file mode 100644 index 0000000000..70be9bfc3a Binary files /dev/null and b/view/theme/frost/images/oxygen/text-x-generic-2.png differ diff --git a/view/theme/frost/images/oxygen/text-x-tex.png b/view/theme/frost/images/oxygen/text-x-tex.png new file mode 100644 index 0000000000..23d8bf7cae Binary files /dev/null and b/view/theme/frost/images/oxygen/text-x-tex.png differ diff --git a/view/theme/frost/images/oxygen/unknown.png b/view/theme/frost/images/oxygen/unknown.png new file mode 100644 index 0000000000..eb1758ae15 Binary files /dev/null and b/view/theme/frost/images/oxygen/unknown.png differ diff --git a/view/theme/frost/images/oxygen/video-x-generic.png b/view/theme/frost/images/oxygen/video-x-generic.png new file mode 100644 index 0000000000..81fe23e7e8 Binary files /dev/null and b/view/theme/frost/images/oxygen/video-x-generic.png differ diff --git a/view/theme/frost/jot-end.tpl b/view/theme/frost/jot-end.tpl index 41f50160f1..0ed2a3af6b 100644 --- a/view/theme/frost/jot-end.tpl +++ b/view/theme/frost/jot-end.tpl @@ -1,5 +1,3 @@ - - - + diff --git a/view/theme/frost/jot-header.tpl b/view/theme/frost/jot-header.tpl index 04169beb58..5291907072 100644 --- a/view/theme/frost/jot-header.tpl +++ b/view/theme/frost/jot-header.tpl @@ -1,7 +1,6 @@ diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl index ae3ab1d3ba..96abeecba7 100644 --- a/view/theme/frost/jot.tpl +++ b/view/theme/frost/jot.tpl @@ -38,7 +38,8 @@
-
@@ -212,7 +212,7 @@ $lbl_dislikes $lbl_social

- +
@@ -229,7 +229,7 @@ $lbl_social $lbl_music

- +
@@ -239,7 +239,7 @@ $lbl_music $lbl_book

- +
@@ -251,7 +251,7 @@ $lbl_book $lbl_tv

- +
@@ -263,7 +263,7 @@ $lbl_tv $lbl_film

- +
@@ -280,7 +280,7 @@ $lbl_film $lbl_love

- +
@@ -292,7 +292,7 @@ $lbl_love $lbl_work

- +
@@ -304,7 +304,7 @@ $lbl_work $lbl_school

- +
diff --git a/view/theme/frost/search_item.tpl b/view/theme/frost/search_item.tpl new file mode 100644 index 0000000000..b78f05d661 --- /dev/null +++ b/view/theme/frost/search_item.tpl @@ -0,0 +1,64 @@ + +{##} +
+
+
+ + $item.name + menu + {##} +
    + $item.item_photo_menu +
+ {##} +
+ {##} +
+ {{ if $item.lock }}{##}$item.lock{##} + {{ else }}
{{ endif }} +
$item.location
+
+
+ {##} + $item.name +
$item.ago
+ + {##} +
+
$item.title
+ {##} +
$item.body
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} +
+
+ {##} + {{ if $item.drop.dropping }}{{ endif }} + {##} + {{ if $item.drop.pagedrop }}{{ endif }} + {##} +
+
+ {##} + + +
+ {{ if $item.conv }} + $item.conv.title + {{ endif }} +
+ +{##} diff --git a/view/theme/frost/smarty3/contact_edit.tpl b/view/theme/frost/smarty3/contact_edit.tpl new file mode 100644 index 0000000000..7105d0057e --- /dev/null +++ b/view/theme/frost/smarty3/contact_edit.tpl @@ -0,0 +1,93 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + +

{{$header}}

+ +
+ + {{$tab_str}} + + + + + + +
+ +
+
+ + +
+ + + {{if $poll_enabled}} +
+
{{$lastupdtext}} {{$last_update}}
+ {{$updpub}} {{$poll_interval}} {{$udnow}} +
+ {{/if}} +
+ + {{include file="field_checkbox.tpl" field=$hidden}} + +
+

{{$lbl_info1}}

+ + +
+
+ + +
+

{{$lbl_vis1}}

+

{{$lbl_vis2}}

+
+{{$profile_select}} +
+ + + +
+
diff --git a/view/theme/frost/smarty3/contact_end.tpl b/view/theme/frost/smarty3/contact_end.tpl index 3c01c0d9aa..962f0c346e 100644 --- a/view/theme/frost/smarty3/contact_end.tpl +++ b/view/theme/frost/smarty3/contact_end.tpl @@ -3,9 +3,5 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} - - + diff --git a/view/theme/frost/smarty3/contact_head.tpl b/view/theme/frost/smarty3/contact_head.tpl index a7fb961089..959c4e2b41 100644 --- a/view/theme/frost/smarty3/contact_head.tpl +++ b/view/theme/frost/smarty3/contact_head.tpl @@ -3,3 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + + diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/smarty3/end.tpl index 4ed99a6e0e..7cdb2e3f7a 100644 --- a/view/theme/frost/smarty3/end.tpl +++ b/view/theme/frost/smarty3/end.tpl @@ -6,20 +6,25 @@ - --->*}} + + + - - - +{{**}} + + + + diff --git a/view/theme/frost/smarty3/event.tpl b/view/theme/frost/smarty3/event.tpl new file mode 100644 index 0000000000..15c4e2b937 --- /dev/null +++ b/view/theme/frost/smarty3/event.tpl @@ -0,0 +1,15 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} +{{foreach $events as $event}} +
+ + {{if $event.item.author_name}}{{$event.item.author_name}}{{/if}} + {{$event.html}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} +
+
+{{/foreach}} diff --git a/view/theme/frost/smarty3/event_end.tpl b/view/theme/frost/smarty3/event_end.tpl index 0ff4e339b5..813047e6ab 100644 --- a/view/theme/frost/smarty3/event_end.tpl +++ b/view/theme/frost/smarty3/event_end.tpl @@ -6,7 +6,5 @@ - + diff --git a/view/theme/frost/smarty3/event_form.tpl b/view/theme/frost/smarty3/event_form.tpl new file mode 100644 index 0000000000..f4a9719ebb --- /dev/null +++ b/view/theme/frost/smarty3/event_form.tpl @@ -0,0 +1,55 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} +

{{$title}}

+ +

+{{$desc}} +

+ +
+ + + + + +
{{$s_text}}
+{{$s_dsel}} {{$s_tsel}} + +
{{$f_text}}
+{{$f_dsel}} {{$f_tsel}} + +
+ +
{{$n_text}}
+ +
+ +
{{$a_text}}
+ +
+ +
{{$t_text}}
+ + + +
{{$d_text}}
+ + + +
{{$l_text}}
+ +
+ +
{{$sh_text}}
+
+ +{{$acl}} + +
+ +
+ + diff --git a/view/theme/frost/smarty3/event_head.tpl b/view/theme/frost/smarty3/event_head.tpl index 9d1c4b5f94..ee23e43056 100644 --- a/view/theme/frost/smarty3/event_head.tpl +++ b/view/theme/frost/smarty3/event_head.tpl @@ -7,5 +7,6 @@ diff --git a/view/theme/frost/smarty3/group_drop.tpl b/view/theme/frost/smarty3/group_drop.tpl new file mode 100644 index 0000000000..2693228154 --- /dev/null +++ b/view/theme/frost/smarty3/group_drop.tpl @@ -0,0 +1,14 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} +
+ +
+
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/smarty3/head.tpl index ce89dc08ba..095743e9b2 100644 --- a/view/theme/frost/smarty3/head.tpl +++ b/view/theme/frost/smarty3/head.tpl @@ -7,7 +7,7 @@ - +{{**}} diff --git a/view/theme/frost/smarty3/jot-end.tpl b/view/theme/frost/smarty3/jot-end.tpl index 055ecc5e61..ebbef166db 100644 --- a/view/theme/frost/smarty3/jot-end.tpl +++ b/view/theme/frost/smarty3/jot-end.tpl @@ -3,8 +3,6 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} - - - + diff --git a/view/theme/frost/smarty3/jot-header.tpl b/view/theme/frost/smarty3/jot-header.tpl index 2ef86d5a8e..92a6aed1d8 100644 --- a/view/theme/frost/smarty3/jot-header.tpl +++ b/view/theme/frost/smarty3/jot-header.tpl @@ -5,8 +5,7 @@ *}} diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/smarty3/jot.tpl index 21485029ff..dc4f2cfe17 100644 --- a/view/theme/frost/smarty3/jot.tpl +++ b/view/theme/frost/smarty3/jot.tpl @@ -43,7 +43,8 @@
-
@@ -195,7 +195,7 @@ {{$lbl_likes}}

- +
@@ -206,7 +206,7 @@ {{$lbl_dislikes}}

- +
@@ -217,7 +217,7 @@ {{$lbl_social}}

- +
@@ -234,7 +234,7 @@ {{$lbl_music}}

- +
@@ -244,7 +244,7 @@ {{$lbl_book}}

- +
@@ -256,7 +256,7 @@ {{$lbl_tv}}

- +
@@ -268,7 +268,7 @@ {{$lbl_film}}

- +
@@ -285,7 +285,7 @@ {{$lbl_love}}

- +
@@ -297,7 +297,7 @@ {{$lbl_work}}

- +
@@ -309,7 +309,7 @@ {{$lbl_school}}

- +
diff --git a/view/theme/frost/smarty3/search_item.tpl b/view/theme/frost/smarty3/search_item.tpl new file mode 100644 index 0000000000..2b37b24583 --- /dev/null +++ b/view/theme/frost/smarty3/search_item.tpl @@ -0,0 +1,69 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + +{{**}} +
+
+
+ + {{$item.name}} + menu + {{**}} +
    + {{$item.item_photo_menu}} +
+ {{**}} +
+ {{**}} +
+ {{if $item.lock}}{{**}}{{$item.lock}}{{**}} + {{else}}
{{/if}} +
{{$item.location}}
+
+
+ {{**}} + {{$item.name}} +
{{$item.ago}}
+ + {{**}} +
+
{{$item.title}}
+ {{**}} +
{{$item.body}}
+ {{if $item.has_cats}} +
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} + + {{if $item.has_folders}} +
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} +
+
+ {{**}} + {{if $item.drop.dropping}}{{/if}} + {{**}} + {{if $item.drop.pagedrop}}{{/if}} + {{**}} +
+
+ {{**}} + + +
+ {{if $item.conv}} + {{$item.conv.title}} + {{/if}} +
+ +{{**}} diff --git a/view/theme/frost/smarty3/suggest_friends.tpl b/view/theme/frost/smarty3/suggest_friends.tpl new file mode 100644 index 0000000000..8843d51284 --- /dev/null +++ b/view/theme/frost/smarty3/suggest_friends.tpl @@ -0,0 +1,21 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} +
+
+ + {{$name}} + +
+
+
+ {{$name}} +
+
+ {{if $connlnk}} +
{{$conntxt}}
+ {{/if}} + +
diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/smarty3/threaded_conversation.tpl index f5c9b3c63c..fbaafa2674 100644 --- a/view/theme/frost/smarty3/threaded_conversation.tpl +++ b/view/theme/frost/smarty3/threaded_conversation.tpl @@ -5,7 +5,7 @@ *}} {{if $dropping}} @@ -25,7 +25,7 @@ {{if $dropping}} diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/smarty3/wall_thread.tpl index d6782484f8..d6fbb3cf06 100644 --- a/view/theme/frost/smarty3/wall_thread.tpl +++ b/view/theme/frost/smarty3/wall_thread.tpl @@ -11,7 +11,7 @@ {{/if}}
- +{{**}}
{{if $item.owner_url}} @@ -29,33 +29,33 @@ {{$item.name}} menu - +{{**}}
    {{$item.item_photo_menu}}
- +{{**}}
- + {{**}}
- {{if $item.lock}}{{$item.lock}} + {{if $item.lock}}{{**}}{{$item.lock}}{{**}} {{else}}
{{/if}}
{{$item.location}}
- + {{**}} {{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
- + {{**}}
{{$item.title}}
- + {{**}}
{{$item.body}} - + {{**}} {{foreach $item.tags as $tag}} {{$tag}} {{/foreach}} - + {{**}} {{if $item.has_cats}}
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
@@ -79,7 +79,7 @@
{{/if}} {{if $item.plink}} - + {{**}}{{**}} {{/if}} {{if $item.edpost}} @@ -95,35 +95,35 @@ {{/if}} - - {{if $item.drop.dropping}}{{/if}} - + {{**}} + {{if $item.drop.dropping}}{{/if}} + {{**}} {{if $item.drop.pagedrop}}{{/if}} - + {{**}}
- + {{**}}
{{$item.dislike}}
{{if $item.threaded}} {{if $item.comment}} - + {{**}} {{$item.comment}} - + {{**}} {{/if}} {{/if}} - - +{{**}} +{{**}} {{foreach $item.children as $child}} {{include file="{{$child.template}}" item=$child}} {{/foreach}} {{if $item.flatten}} - +{{**}} {{$item.comment}} - +{{**}} {{/if}} {{if $item.comment_lastcollapsed}}{{/if}} diff --git a/view/theme/frost/smarty3/wallmsg-end.tpl b/view/theme/frost/smarty3/wallmsg-end.tpl index a0da3e095b..c7ad27401f 100644 --- a/view/theme/frost/smarty3/wallmsg-end.tpl +++ b/view/theme/frost/smarty3/wallmsg-end.tpl @@ -3,8 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + - + diff --git a/view/theme/frost/smarty3/wallmsg-header.tpl b/view/theme/frost/smarty3/wallmsg-header.tpl index dcf8ae94df..6107a8a087 100644 --- a/view/theme/frost/smarty3/wallmsg-header.tpl +++ b/view/theme/frost/smarty3/wallmsg-header.tpl @@ -6,6 +6,7 @@ diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 05e4e65b9b..0e0ce6d71f 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -92,12 +92,17 @@ blockquote { } #panel { - background-color: ivory; position: absolute; z-index: 2; width: 30%; padding: 25px; - border: 1px solid #444; + +/* background-color: ivory; + border: 1px solid #444;*/ + + border-radius: 7px; + background-color: #222; + color: #eee; } .heart { @@ -337,6 +342,11 @@ section { } .tabs li { margin: 0px; list-style: none; } .tabs a { +/* background-image: url(head.jpg); + background-repeat: repeat-x; + background-position: 0px 0px; + background-size: auto 45px;*/ + padding: 0.4em 0.5em; margin-right: 0.5em; margin-bottom: 0.5em; @@ -359,6 +369,9 @@ section { .tab.active { font-weight: bold; +/* background-image: url(head-flipped.jpg); + background-position: 0px -20px;*/ + box-shadow: 2px 2px 3px #aaa inset; -moz-box-shadow: 2px 2px 3px #aaa inset; -webkit-box-shadow: 2px 2px 3px #aaa inset; @@ -375,6 +388,12 @@ footer { padding-bottom: 1em; } +#maintenance-message { + font-size: 20px; + text-align: center; + margin-top: 10em; +} + .birthday-today, .event-today { font-weight: bold; } @@ -1173,15 +1192,16 @@ input#dfrn-url { float: left; width:110px; margin-right:10px; + margin-bottom:10px; } .comment .wall-item-info { width: 70px; } -.wall-item-photo-wrapper { +/*.wall-item-photo-wrapper { margin-bottom: 10px; width: 100px; -} +}*/ .wall-item-photo-menu-button { display: block; position: absolute; @@ -1191,7 +1211,7 @@ input#dfrn-url { margin: 0px; padding: 0px; width: 16px; height: 16px; - top: 94px; left:0px; + top: 76px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -1203,7 +1223,7 @@ input#dfrn-url { background: #FFFFFF; position: absolute; /* left: 10px; top: 90px;*/ - left: 0px; top:110px; + left: 0px; top:92px; display: none; z-index: 10000; } @@ -1219,7 +1239,7 @@ input#dfrn-url { left: 50px; margin: 0; position: absolute; - top: 70px; + top: 63px; width: 30px } .wallwall .wwto img { @@ -1234,7 +1254,7 @@ input#dfrn-url { .wall-item-arrowphoto-wrapper { position: absolute; left: 75px; - top: 70px; + top: 63px; z-index: 100; } .wall-item-lock { @@ -1354,15 +1374,34 @@ input#dfrn-url { .wall-item-content img { display: block; - margin-top: 10px; + margin-top: 12px; + margin-bottom: 12px; margin-right: auto; margin-left: auto; +/* max-width: 100%;*/ + max-width: 400px; /* to make room for the shadow */ + padding: 5px; + + box-shadow: 0 0 10px #000; + -moz-box-shadow: 0 0 10px #000; + -webkit-box-shadow: 0 0 10px #000; +} + +.shared_content img { max-width: 100%; } +.comment .wall-item-content img { + max-width: 370px; +} + .wall-item-content img.smiley { display: inline; margin: auto; + padding: 0; + box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; } .divgrow-showmore { @@ -1420,7 +1459,7 @@ input#dfrn-url { .comment .wall-item-tools { margin-left: 0px; - margin-top: 0px; + margin-top: 5px; padding-top: 0px; } @@ -1502,6 +1541,27 @@ input#dfrn-url { margin-left: 30px; } +.shared_header { + border-top: 1px solid #aaa; + color: #999; + + height: 42px; /* 32 px for the image plus 10 px for the margin around the image */ + padding-top: 0.5em; + margin-top: 1em; + margin-bottom: 1em; + +} +.shared_header img { + float: left; + + margin: auto 1em auto auto; + padding: 0; + + box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; +} + #profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { margin-top: 15px; @@ -1925,7 +1985,10 @@ input#dfrn-url { } .contact-edit-submit { - margin-top: 20px; + margin-top: 10px; + clear: left; + display: block; + margin-bottom: 45px; } @@ -2372,8 +2435,10 @@ aside input[type='text'] { } .photo-top-image-wrapper { -/* position: relative; */ - float: left; +/* position: relative; + float: left;*/ + display: inline-block; + vertical-align: top; margin-top: 15px; margin-right: 15px; margin-left: 15px; @@ -2381,8 +2446,13 @@ aside input[type='text'] { /* width: 200px; height: 200px; overflow: hidden; */ } -.photo-top-image-wrapper img { - max-width: 550px; +.photo-album-image-wrapper img, .photo-top-image-wrapper img { + max-width: 225px; + padding: 5px; + + box-shadow: 0 0 10px #000; + -moz-box-shadow: 0 0 10px #000; + -webkit-box-shadow: 0 0 10px #000; } .photo-top-album-name { width: 100%; @@ -2510,9 +2580,8 @@ aside input[type='text'] { #photos-upload-choosefile-outer-wrapper { margin-top: 35px; - padding-top: 50px; padding-left: 50px; - position: relative; + margin-bottom: 4em; } #photos-upload-noshare-div { margin-top: 0px; @@ -2578,12 +2647,13 @@ aside input[type='text'] { } #photo-edit-delete-button { - margin-left: 270px; +/* margin-left: 270px;*/ + float: right; } #photos-upload-choose { - position: absolute; +/* position: absolute; top: 0px; - left: 55px; + left: 55px;*/ } .settings-submit, .profile-edit-submit-button { margin-bottom: 10px; @@ -2832,7 +2902,7 @@ aside input[type='text'] { } #event-share-text { - float: left; +/* float: left;*/ margin-top: 10px; margin-left: 5px; } @@ -2957,9 +3027,17 @@ aside input[type='text'] { /*#photo-photo { float: left; }*/ +#photo-photo { + display: block; + margin-left: auto; + margin-right: auto; + margin-bottom: 2em; + text-align: center; +} #photo-photo img { - max-width: 555px; - margin-left: 5px; +/* max-width: 555px; + margin-left: 5px;*/ + max-width: 100%; } #photo-photo-end { clear: both; @@ -2989,11 +3067,18 @@ aside input[type='text'] { } .profile-match-wrapper { - float: left; + display: inline-block; padding: 10px; - width: 120px; - height: 120px; + /*width: 120px; + height: 120px;*/ scroll: auto; + margin-bottom: 2em; + vertical-align: top; +} +.profile-match-wrapper .icon.drophide { + margin-left: auto; + margin-right: auto; + margin-top: 1em; } #profile-match-wrapper-end { clear: both; @@ -3456,6 +3541,13 @@ aside input[type='text'] { background-repeat: no-repeat; opacity: 0.4; } +.icon.drophide:hover { + display: block; width: 16px; height: 16px; + background-size: 100% 100%; + background-image: url('images/drop-16.png'); + background-repeat: no-repeat; + opacity: 1.0; +} .edit { background-position: -80px 0px;} /*.camera { background-position: -96px 0px;}*/ .icon.camera{ @@ -3758,21 +3850,66 @@ aside input[type='text'] { }*/ .attachtype { - display: block; width: 20px; height: 23px; + display: block; float: left; - background-image: url('../../../images/content-types.png'); - background-position: -80px 0px; + background-size: 100% 100%; + width: 48px; + height: 48px; + background-image: url('images/oxygen/unknown.png'); } .body-attach { margin-top: 10px; } -.type-video { background-position: 0px 0px; } +/*.type-video { background-position: 0px 0px; } .type-image { background-position: -20px 0px; } .type-audio { background-position: -40px 0px; } .type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } +.type-unkn { background-position: -80px 0px; }*/ +.type-video { + background-image: url('images/oxygen/video-x-generic.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +} +.type-image { + background-image: url('images/oxygen/image-x-generic.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +} +.type-audio { background-image: url('images/oxygen/audio-x-generic.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +} + +.type-text { + background-image: url('images/oxygen/text-x-generic-2.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +} +.subtype-msword, .subtype-vnd-openxmlformats-officedocument-wordprocessingml-document { + background-image: url('images/oxygen/application-msword.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +} +.subtype-pdf { + background-image: url('images/oxygen/application-pdf.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +} +/*.type-unkn { + background-image: url('images/oxygen/unknown.png'); + background-size: 100% 100%; + width: 48px; + height: 48px; +}*/ + /* autocomplete popup */ @@ -3852,6 +3989,33 @@ div.jGrowl-notification { .nav-notify.show { display: block; } +ul#nav-network-notifications-popup { + text-align: center; + line-height: 18px; + + border: 1px solid #AAAAAA; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + + -moz-box-shadow: 3px 3px 5px #555; + -webkit-box-shadow: 3px 3px 5px #555; + box-shadow: 3px 3px 5px #555; + + background: #FFFFFF; + + display: none; + list-style: none; + + width: 10em; + position: absolute; + margin: 0px; + top: 15px; + left: 55px; + padding: 1em 0px; + + z-index: 11000; +} ul.notifications-menu-popup { position: absolute; display: none; diff --git a/view/theme/frost/suggest_friends.tpl b/view/theme/frost/suggest_friends.tpl new file mode 100644 index 0000000000..e0d1c29441 --- /dev/null +++ b/view/theme/frost/suggest_friends.tpl @@ -0,0 +1,16 @@ +
+
+ + $name + +
+
+
+ $name +
+
+ {{ if $connlnk }} +
$conntxt
+ {{ endif }} + +
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php index 8deef782f0..3decb2a118 100644 --- a/view/theme/frost/theme.php +++ b/view/theme/frost/theme.php @@ -4,7 +4,7 @@ * Name: Frost * Description: Like frosted glass * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). - * Version: Version 0.3.2 + * Version: Version 0.4 * Author: Zach P * Maintainer: Zach P */ @@ -30,3 +30,45 @@ function frost_content_loaded(&$a) { } +function frost_install() { + register_hook('prepare_body_final', 'view/theme/frost/theme.php', 'frost_item_photo_links'); + + logger("installed theme frost"); +} + +function frost_uninstall() { + unregister_hook('bbcode', 'view/theme/frost/theme.php', 'frost_bbcode'); + + logger("uninstalled theme frost"); +} + +function frost_item_photo_links(&$a, &$body_info) { + require_once('include/Photo.php'); + $phototypes = Photo::supportedTypes(); + + $occurence = 1; + $p = bb_find_open_close($body_info['html'], ""); + while($p !== false && ($occurence++ < 500)) { + $link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']); + + $matches = array(); + preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches); + if($matches) { + + // Replace the link for the photo's page with a direct link to the photo itself + $newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link); + + // Add a "quiet" parameter to any redir links to prevent the "XX welcomes YY" info boxes + $newlink = preg_replace("/href=\"([^\"]+)\/redir\/([^\"]+)&url=([^\"]+)\"/", 'href="$1/redir/$2&quiet=1&url=$3"', $newlink); + + // Having any arguments to the link for Colorbox causes it to fetch base64 code instead of the image + $newlink = preg_replace("/\/[?&]zrl=([^&\"]+)/", '', $newlink); + + $body_info['html'] = str_replace($link, $newlink, $body_info['html']); + + } + + $p = bb_find_open_close($body_info['html'], "", $occurence); + } +} + diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl index cdafaad39c..a987541831 100644 --- a/view/theme/frost/threaded_conversation.tpl +++ b/view/theme/frost/threaded_conversation.tpl @@ -1,6 +1,6 @@ {{ if $dropping }} @@ -20,7 +20,7 @@ $live_update {{ if $dropping }} diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl index 85b0183c4c..9c63bef227 100644 --- a/view/theme/frost/wall_thread.tpl +++ b/view/theme/frost/wall_thread.tpl @@ -6,7 +6,7 @@ {{endif}}
- +{##}
{{ if $item.owner_url }} @@ -24,33 +24,33 @@ $item.name menu - +{##}
    $item.item_photo_menu
- +{##}
- + {##}
- {{ if $item.lock }}$item.lock + {{ if $item.lock }}{##}$item.lock{##} {{ else }}
{{ endif }}
$item.location
- + {##} $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
- + {##}
$item.title
- + {##}
$item.body - + {##} {{ for $item.tags as $tag }} $tag {{ endfor }} - + {##} {{ if $item.has_cats }}
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
@@ -74,7 +74,7 @@
{{ endif }} {{ if $item.plink }} - + {##}{##} {{ endif }} {{ if $item.edpost }} @@ -90,35 +90,35 @@ {{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - + {##} + {{ if $item.drop.dropping }}{{ endif }} + {##} {{ if $item.drop.pagedrop }}{{ endif }} - + {##}
- + {##}
$item.dislike
{{ if $item.threaded }} {{ if $item.comment }} - + {##} $item.comment - + {##} {{ endif }} {{ endif }} - - +{##} +{##} {{ for $item.children as $child }} {{ inc $child.template with $item=$child }}{{ endinc }} {{ endfor }} {{ if $item.flatten }} - +{##} $item.comment - +{##} {{ endif }} {{if $item.comment_lastcollapsed}}{{endif}} diff --git a/view/theme/frost/wallmsg-end.tpl b/view/theme/frost/wallmsg-end.tpl index d9e34d6fba..6baa6e7dc1 100644 --- a/view/theme/frost/wallmsg-end.tpl +++ b/view/theme/frost/wallmsg-end.tpl @@ -1,5 +1,4 @@ + - + diff --git a/view/theme/frost/wallmsg-header.tpl b/view/theme/frost/wallmsg-header.tpl index 9cd2bd6e23..7523539483 100644 --- a/view/theme/frost/wallmsg-header.tpl +++ b/view/theme/frost/wallmsg-header.tpl @@ -1,6 +1,7 @@