From 9aa05eb911aca6311dab451bc80b88e0c035c9f2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 4 Nov 2022 12:28:21 -0400 Subject: [PATCH 1/3] Deprecate themes duepuntozero, quattro and smoothly --- doc/Text_comment.md | 10 -- doc/Text_editor.md | 9 - doc/de/Text_comment.md | 10 -- doc/de/Text_editor.md | 22 +-- doc/img/darkbubble.png | Bin 2162 -> 0 bytes doc/img/darkzero.png | Bin 2751 -> 0 bytes doc/img/dispy.png | Bin 3208 -> 0 bytes doc/img/editor_darkbubble.png | Bin 2462 -> 0 bytes doc/img/editor_dpzero.png | Bin 5599 -> 0 bytes doc/img/editor_zero.png | Bin 2477 -> 0 bytes doc/themes.md | 170 ++---------------- static/settings.config.php | 2 +- tests/datasets/config/.htconfig.php | 2 +- .../Config/Cache/ConfigFileLoaderTest.php | 2 +- view/theme/duepuntozero/unsupported | 0 view/theme/frio/js/jquery.tools.min.js | 14 ++ view/theme/frio/templates/theme_settings.tpl | 2 +- view/theme/quattro/unsupported | 0 view/theme/smoothly/unsupported | 0 19 files changed, 40 insertions(+), 203 deletions(-) delete mode 100644 doc/img/darkbubble.png delete mode 100644 doc/img/darkzero.png delete mode 100644 doc/img/dispy.png delete mode 100644 doc/img/editor_darkbubble.png delete mode 100644 doc/img/editor_dpzero.png delete mode 100644 doc/img/editor_zero.png create mode 100644 view/theme/duepuntozero/unsupported create mode 100644 view/theme/frio/js/jquery.tools.min.js create mode 100644 view/theme/quattro/unsupported create mode 100644 view/theme/smoothly/unsupported diff --git a/doc/Text_comment.md b/doc/Text_comment.md index 7cd26d55f..37a91a7da 100644 --- a/doc/Text_comment.md +++ b/doc/Text_comment.md @@ -30,13 +30,3 @@ Here you can find an overview of the different ways to comment and sort existing

post_choose.png This symbol is used to choose more than one post to delete in a single step. After selecting all posts, go to the end of the page and click "Delete Selected Items".

- -**Symbols of other themes** - -Darkbubble darkbubble.png - -Darkzero darkzero.png - -(incl. more "zero"-themes, slackr, comix, easterbunny, facepark) - -Dispy dispy.png (incl. smoothly, testbubble) diff --git a/doc/Text_editor.md b/doc/Text_editor.md index ebbaf2254..b7d0937aa 100644 --- a/doc/Text_editor.md +++ b/doc/Text_editor.md @@ -24,10 +24,6 @@ Below are examples of the post editor in 3 of Friendica's common themes:
Post editor, with the Vier theme.

-
-duepuntozero editor -
Post editor, with the Duepuntozero theme.
-
Post title is optional, you can set it by clicking on "Set title". @@ -73,11 +69,6 @@ These icons can change depending on the theme. Some examples: vier.png   - - Smoothly: - darkbubble.png -   - * how to [upload](help/FAQ#upload) files

 

diff --git a/doc/de/Text_comment.md b/doc/de/Text_comment.md index 6dc47a524..c9203dfd4 100644 --- a/doc/de/Text_comment.md +++ b/doc/de/Text_comment.md @@ -47,13 +47,3 @@ Wähle eine vorhandene Gruppe oder gib einen neuen Namen ein. Die erstellten Gru post_choose.png Mit diesem Symbol kannst du mehrere Beiträge auswählen und gesammelt löschen. Hierfür gehst du nach dem Markieren aller gewünschten Beiträge auf "Lösche die markierten Beiträge" am Ende der Seite mit allen Beiträgen.

- -**Im Folgenden findest du Symbole weiterer Themen** - -Darkbubble darkbubble.png - -Darkzero darkzero.png - -(inkl. weiterer "zero"-Themen, slackr, comix, easterbunny, facepark) - -Dispy dispy.png (inkl. smoothly, testbubble) diff --git a/doc/de/Text_editor.md b/doc/de/Text_editor.md index 5f90f3b91..4c71ae559 100644 --- a/doc/de/Text_editor.md +++ b/doc/de/Text_editor.md @@ -9,35 +9,35 @@ Achtung: für dieses Beispiel wurde das Thema "Diabook" genutzt. Wenn du ein anderes Design benutzt, wirst du manche dieser Symbole gar nicht oder in anderer Form vorfinden. -editor +editor Die einzelnen Symbole -editor Wenn du auf dieses Symbol klickst, dann kannst du ein Bild von deinem Computer hinzufügen. +editor Wenn du auf dieses Symbol klickst, dann kannst du ein Bild von deinem Computer hinzufügen. Wenn du eine Internetadresse (URL) eingeben willst, dann kannst du das "Baum"-Symbol im oberen Teil des Editors nutzen. Wenn du ein Bild ausgewählt hast, dann erscheint eine Miniaturdarstellung des Bildes im Editor.*

-paper_clip Wenn du dieses Symbol anklickst, dann kannst du weitere Dateien von deinem Computer einfügen. Eine Vorschau des Dateiinhalts erfolgt nicht.* +paper_clip Wenn du dieses Symbol anklickst, dann kannst du weitere Dateien von deinem Computer einfügen. Eine Vorschau des Dateiinhalts erfolgt nicht.*

-chain Wenn du die Kette anklickst, dann kannst du eine Internetadresse (URL) einfügen. +chain Wenn du die Kette anklickst, dann kannst du eine Internetadresse (URL) einfügen. Im Editor erscheint automatisch eine kurze Information zum eingefügten Link.*

-video Mit dieser Funktion kannst du die Internetadresse (URL) einer Videodatei einfügen. +video Mit dieser Funktion kannst du die Internetadresse (URL) einer Videodatei einfügen. Das Video erscheint dann mit einem Player in deinem Beitrag. Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser verschiedene Videoformate unterstützt (z.B. WebM oder MP4). Außerdem kannst du hier die URLs von Videos auf Youtube, Vimeo und manchen anderen Videohostern eingeben. Die Videos werden dann mit Vorschaubild angezeigt, nach einem Klick öffnet sich ein eingebetteter Player.*

-mic Mit dieser Funktion kannst du die Internetadresse (URL) einer Sound-Datei einfügen. +mic Mit dieser Funktion kannst du die Internetadresse (URL) einer Sound-Datei einfügen. Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser und Betriebssystem MP3, Ogg oder AAC unterstützt. Außerdem kannst du hier auch URLs von manchen Audiohostern wie Soundcloud eingeben, um eine dort gespeicherte Audiodatei mit Player in deinem Beitrag anzuzeigen.*

-globe Wenn du dieses Symbol wählst, dann kannst du deinen Standort festlegen. +globe Wenn du dieses Symbol wählst, dann kannst du deinen Standort festlegen. Hier reicht schon eine Angabe wie "Berlin" oder "10775". Dieser Eintrag führt anschließend zu einer Suchanfrage bei Google Maps.

@@ -46,12 +46,6 @@ Dieser Eintrag führt anschließend zu einer Suchanfrage bei Google Maps. **Im Folgenden findest du Symbole weiterer Themen** -Cleanzero cleanzero.png - -(inkl. weiterer "zero"-Themen, comix, easterbunny, facepark, slackr - -Darkbubble darkbubble.png (inkl. smoothly, testbubble) - Frio frio.png -Vier vier.png (inkl. dispy) +Vier vier.png diff --git a/doc/img/darkbubble.png b/doc/img/darkbubble.png deleted file mode 100644 index 08c7a93ee91ffd49e707aefc9f08cac6339f3663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2162 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 diff --git a/doc/img/darkzero.png b/doc/img/darkzero.png deleted file mode 100644 index 00dc3ee4f36fb9d08b49a9a749bd416257f67293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2751 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 diff --git a/doc/img/editor_dpzero.png b/doc/img/editor_dpzero.png deleted file mode 100644 index 79f0cb35d0f8fb8a34e0186ea4daa6d6e4297138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5599 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 z z$Jw@v6&e{8LLx!z!l@f+$?S*(8hamS?b_%0`SS8|jYiYd)MT|<7Z(=`3kx+GjYuTo z@pw24uddL`$6txCvQjxLl*`LlZcdTOGNCYdVMJ5XAa;uj^OR^ZZo(Q{3{`baNz4!O zC6(phD0KR^f0)0w{@@sVG*Z*>E$(&ZZLl&xFAF%*_gb1-tC6FF959vk&J+hsr2sdC zj1G*)SVMslMvNhcZ`!=)Kqh-1he~ILZ`w?ZA%{~pMkLVqd_I-VB*u^_TehxQ?^Rx2 zuGMPwdVNn%&)nQxetv#^eSKwR<-vmor>3S})euEd6h&8#{Mz^{nY)H3Z?<)pmCF5u zDGXj=RWFQaO4`6vS8h(x&9?492-9}y`J+uqrAug_|JV6*fORn%O^ z=jolm7@#*9*jT`k0^FI5k+1Ux&dYD7e>9Z#&eVs$nc{#c2-$96_W1A;CY4HISxou# zG^~cO4}(>b7(=GgnY3hfICUd2hP(!NdA;7s%F5>EX1!i-Hk+50mQJ2LSyxvlkx0_h z(;q*6jKfnP5WuTIAV5)cW!^$j6n^S|`2W|~4CWf1gw59C!hAF(?H4id)WxJTOqL0_ zC&0HXcTBUke|nKaM-8SQYOZRvjjipSUG1G+-KIXYLXFc?yG#d0KVd1rod&!gf`wA$ zj}^MUyMv7xUz#9cNxr*jZmG8=9uVK)YAWoTrSpRjQ1#@CJ4^z^h$ zCTneNZEI_@+wBl9jYcCDi&Ilm$HvC+*|JzH|Mi6c!NF%A!yyDgJd@L|;Yru#7VBmcwr2y_42 z2fO=dN*cUIQ_>(|Wu--PM*#co+&6qFN=%Iw2iF=5*h9) z=_d@Pu{7XK172>DwclA#>-(x?B3CsoEH@VI03A39WAEdFGTOGAUcOLdak; zqiopKgQ2rIT^U&IUXTj8yqKT23JhYa#!HTof4~>lCRFq9)*q{5% z;i*T$sT;%M;{6>MF@_wGK%*tILnEWsU?Vv;HkOx{H#<8EZ{2QpVPWC^{rf#0PvGWY zg4 z>(bJaR4PSLbaZsoZntM-Wbk;r@$qr&Es@>fz1h|+t8IQ^+-&O(kTAb2{f@)Ova&z_ z;%iaiHSP7Y7t8P;I{JP-u<&Ox7`zSE`_5vtL%aiY@HSXqbtCy)ANJlhMzr`rmJ{O{ zu|Mrbe)orWW4G^Iua`7GKY#!JeStv0<#Kg8oj;$wMUeTcat&M9h00>)He9mVy33+Jicdu-XvhmIHpSi#`DJ~7koH9pX)ZXIvxBc#k&0X z7!+;|I9!T4RsJQ}s - - - -defines a formular consisting of a [select](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) pull-down which contains all aviable variants and s submit button. -See the documentation about [SMARTY3 templates](/help/snarty3-templates.md) for a summary of friendica specific blocks other than the select element. -But we don't really need to change anything at the template itself. - -The template alone wont work though. -You make friendica aware of its existance and tell it how to use the template file, by defining a config.php file. -It needs to define at least the following functions - -* theme_content -* theme_post - -and may also define functions for the admin interface - -* theme_admin -* theme_admin_post. - -theme_content and theme_admin are used to make the form available in the settings, repectively the admin panel. -The _post functions handle the processing of the send form, in this case they save to selected variand in friendicas database. - -To make your own variation appear in the menu, all you need to do is to create a new CSS file in the deriv directoy and include it in the array in the config.php: - - $colorset = array( - 'default'=>DI::l10n()->t('default'), - 'greenzero'=>DI::l10n()->t('greenzero'), - 'purplezero'=>DI::l10n()->t('purplezero'), - 'easterbunny'=>DI::l10n()->t('easterbunny'), - 'darkzero'=>DI::l10n()->t('darkzero'), - 'comix'=>DI::l10n()->t('comix'), - 'slackr'=>DI::l10n()->t('slackr'), - ); - -the 1st part of the line is the name of the CSS file (without the .css) the 2nd part is the common name of the variant. -Calling the DI::l10n()->t() function with the common name makes the string translateable. -The selected 1st part will be saved in the database by the theme_post function. - - function theme_post(App $a){ - // non local users shall not pass - if (!Session::getLocalUser()) { - return; - } - // if the one specific submit button was pressed then proceed - if (isset($_POST['duepuntozero-settings-submit'])){ - // and save the selection key into the personal config of the user - DI::pConfig()->set(Session::getLocalUser(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']); - } - } - -Now that this information is set in the database, what should friendica do with it? -For this, have a look at the theme.php file of the *duepunto zero*. -There you'll find somethink alike - - $colorset = DI::pConfig()->get(Session::getLocalUser(), 'duepuntozero','colorset'); - if (!$colorset) - $colorset = DI::config()->get('duepuntozero', 'colorset'); - if ($colorset) { - if ($colorset == 'greenzero') - DI::page()['htmlhead'] .= ''."\n"; - /* some more variants */ - } - -which tells friendica to get the personal config of a user. -Check if it is set and if not look for the global config. -And finally if a config for the colorset was found, apply it by adding a link to the CSS file into the HTML header of the page. -So you'll just need to add a if selection, fitting your variant keyword and link to the CSS file of it. - -Done. -Now you can use the variant on your system. -But remember once the theme.php or the config.php you have to readd your variant to them. -If you think your color variation could be benifical for other friendica users as well, feel free to generate a pull request at github so we can include your work into the repository. - -### Inheritation - -Say, you like the duepuntozero but you want to have the content of the outer columns left and right exchanged. -That would be not a color variation as shown above. -Instead we will create a new theme, duepuntozero_lr, inherit the properties of duepuntozero and make small changes to the underlying php files. - -So create a directory called duepunto_lr and create a file called theme.php with your favorite text editor. -The content of this file should be something like - - setThemeInfoValue('extends', 'duepuntozero'); - - $a->set_template_engine('smarty3'); - /* and more stuff e.g. the JavaScript function for the header */ - } - -Next take the default.php file found in the /view direcotry and exchange the aside and right_aside elements. -So the central part of the file now looks like this: - - - - -
-
-
- -
- - -Finally we need a style.css file, inheriting the definitions from the parent theme and containing out changes for the new theme. -***Note***:You need to create the style.css and at lest import the base CSS file from the parent theme. - - @import url('../duepuntozero/style.css'); - -Done. -But I agree it is not really useful at this state. -Nevertheless, to use it, you just need to activate in the admin panel. -That done, you can select it in the settings like any other activated theme. - ## Creating a Theme from Scratch Keep patient. @@ -231,15 +92,19 @@ Supported formats are PNG and JPEG. This is the main definition file of the theme. In the header of that file, some meta information is stored. -For example, have a look at the theme.php of the *quattro* theme: +For example, have a look at the theme.php of the *vier* theme: - * Maintainer: Fabio - * Maintainer: Tobias + * Author: Ike + * Author: Beanow + * Maintainer: Ike + * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ */ You see the definition of the theme's name, it's version and the initial author of the theme. @@ -255,11 +120,11 @@ This will make our job a little easier, as we don't have to specify the full nam The next crucial part of the theme.php file is a definition of an init function. The name of the function is _init. -So in the case of quattro it is +So in the case of vier it is - function quattro_init(App $a) { - $a->theme_info = array(); - $a->set_template_engine('smarty3'); + function vier_init(App $a) { + $a->theme_info = array(); + $a->set_template_engine('smarty3'); } Here we have set the basic theme information, in this case they are empty. @@ -269,12 +134,6 @@ At the moment you should use the *smarty3* engine. There once was a friendica specific templating engine as well but that is not used anymore. If you like to use another templating engine, please implement it. -When you want to inherit stuff from another theme you have to *announce* this in the theme_info: - - $a->setThemeInfoValue('extends', 'duepuntozero'); - -which declares *duepuntozero* as parent of the theme. - If you want to add something to the HTML header of the theme, one way to do so is by adding it to the theme.php file. To do so, add something alike @@ -282,7 +141,6 @@ To do so, add something alike /* stuff you want to add to the header */ EOT; -The $a variable holds the friendica application. So you can access the properties of this friendica session from the theme.php file as well. ### default.php diff --git a/static/settings.config.php b/static/settings.config.php index 89f87fee6..3ec7fef9b 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -62,7 +62,7 @@ return [ // allowed_themes (Comma-separated list) // Themes users can change to in their settings. - 'allowed_themes' => 'frio,quattro,vier,duepuntozero,smoothly', + 'allowed_themes' => 'frio,vier', // cache_contact_avatar (Boolean) // Cache versions of the contact avatars. Uses a lot of storage space diff --git a/tests/datasets/config/.htconfig.php b/tests/datasets/config/.htconfig.php index 696ca5a03..3fa3d37a5 100644 --- a/tests/datasets/config/.htconfig.php +++ b/tests/datasets/config/.htconfig.php @@ -49,7 +49,7 @@ $a->config['php_path'] = '/another/php'; $a->config['system']['huburl'] = '[internal]'; // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'frio,quattro,vier,duepuntozero'; +$a->config['system']['allowed_themes'] = 'frio,vier'; // default system theme $a->config['system']['theme'] = 'frio'; diff --git a/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php b/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php index 43decf105..892450b0f 100644 --- a/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php +++ b/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php @@ -200,7 +200,7 @@ class ConfigFileLoaderTest extends MockedTest self::assertEquals('999', $configCache->get('config', 'max_import_size')); self::assertEquals('666', $configCache->get('system', 'maximagesize')); - self::assertEquals('frio,quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes')); + self::assertEquals('frio,vier', $configCache->get('system', 'allowed_themes')); self::assertEquals('1', $configCache->get('system', 'no_regfullname')); } diff --git a/view/theme/duepuntozero/unsupported b/view/theme/duepuntozero/unsupported new file mode 100644 index 000000000..e69de29bb diff --git a/view/theme/frio/js/jquery.tools.min.js b/view/theme/frio/js/jquery.tools.min.js new file mode 100644 index 000000000..4a44fb7c4 --- /dev/null +++ b/view/theme/frio/js/jquery.tools.min.js @@ -0,0 +1,14 @@ +// @license magnet:?xt=urn:btih:e95b018ef3580986a04669f1b5879592219e2a7a&dn=public-domain.txt Public Domains +/*! + * jQuery Tools v1.2.7 - The missing UI library for the Web + * + * rangeinput/rangeinput.js + * + * NO COPYRIGHTS OR LICENSES. DO WHAT YOU LIKE. + * + * http://flowplayer.org/tools/ + * + */ +(function(a){a.tools=a.tools||{version:"v1.2.7"};var b;b=a.tools.rangeinput={conf:{min:0,max:100,step:"any",steps:0,value:0,precision:undefined,vertical:0,keyboard:!0,progress:!1,speed:100,css:{input:"range",slider:"slider",progress:"progress",handle:"handle"}}};var c,d;a.fn.drag=function(b){document.ondragstart=function(){return!1},b=a.extend({x:!0,y:!0,drag:!0},b),c=c||a(document).on("mousedown mouseup",function(e){var f=a(e.target);if(e.type=="mousedown"&&f.data("drag")){var g=f.position(),h=e.pageX-g.left,i=e.pageY-g.top,j=!0;c.on("mousemove.drag",function(a){var c=a.pageX-h,e=a.pageY-i,g={};b.x&&(g.left=c),b.y&&(g.top=e),j&&(f.trigger("dragStart"),j=!1),b.drag&&f.css(g),f.trigger("drag",[e,c]),d=f}),e.preventDefault()}else try{d&&d.trigger("dragEnd")}finally{c.off("mousemove.drag"),d=null}});return this.data("drag",!0)};function e(a,b){var c=Math.pow(10,b);return Math.round(a*c)/c}function f(a,b){var c=parseInt(a.css(b),10);if(c)return c;var d=a[0].currentStyle;return d&&d.width&&parseInt(d.width,10)}function g(a){var b=a.data("events");return b&&b.onSlide}function h(b,c){var d=this,h=c.css,i=a("
").data("rangeinput",d),j,k,l,m,n;b.before(i);var o=i.addClass(h.slider).find("a").addClass(h.handle),p=i.find("div").addClass(h.progress);a.each("min,max,step,value".split(","),function(a,d){var e=b.attr(d);parseFloat(e)&&(c[d]=parseFloat(e,10))});var q=c.max-c.min,r=c.step=="any"?0:c.step,s=c.precision;s===undefined&&(s=r.toString().split("."),s=s.length===2?s[1].length:0);if(b.attr("type")=="range"){var t=b.clone().wrap("
").parent().html(),u=a(t.replace(/type/i,"type=text data-orig-type"));u.val(c.value),b.replaceWith(u),b=u}b.addClass(h.input);var v=a(d).add(b),w=!0;function x(a,f,g,h){g===undefined?g=f/m*q:h&&(g-=c.min),r&&(g=Math.round(g/r)*r);if(f===undefined||r)f=g*m/q;if(isNaN(g))return d;f=Math.max(0,Math.min(f,m)),g=f/m*q;if(h||!j)g+=c.min;j&&(h?f=m-f:g=c.max-g),g=e(g,s);var i=a.type=="click";if(w&&k!==undefined&&!i){a.type="onSlide",v.trigger(a,[g,f]);if(a.isDefaultPrevented())return d}var l=i?c.speed:0,t=i?function(){a.type="change",v.trigger(a,[g])}:null;j?(o.animate({top:f},l,t),c.progress&&p.animate({height:m-f+o.height()/2},l)):(o.animate({left:f},l,t),c.progress&&p.animate({width:f+o.width()/2},l)),k=g,n=f,b.val(g);return d}a.extend(d,{getValue:function(){return k},setValue:function(b,c){y();return x(c||a.Event("api"),undefined,b,!0)},getConf:function(){return c},getProgress:function(){return p},getHandle:function(){return o},getInput:function(){return b},step:function(b,e){e=e||a.Event();var f=c.step=="any"?1:c.step;d.setValue(k+f*(b||1),e)},stepUp:function(a){return d.step(a||1)},stepDown:function(a){return d.step(-a||-1)}}),a.each("onSlide,change".split(","),function(b,e){a.isFunction(c[e])&&a(d).on(e,c[e]),d[e]=function(b){b&&a(d).on(e,b);return d}}),o.drag({drag:!1}).on("dragStart",function(){y(),w=g(a(d))||g(b)}).on("drag",function(a,c,d){if(b.is(":disabled"))return!1;x(a,j?c:d)}).on("dragEnd",function(a){a.isDefaultPrevented()||(a.type="change",v.trigger(a,[k]))}).click(function(a){return a.preventDefault()}),i.click(function(a){if(b.is(":disabled")||a.target==o[0])return a.preventDefault();y();var c=j?o.height()/2:o.width()/2;x(a,j?m-l-c+a.pageY:a.pageX-l-c)}),c.keyboard&&b.keydown(function(c){if(!b.attr("readonly")){var e=c.keyCode,f=a([75,76,38,33,39]).index(e)!=-1,g=a([74,72,40,34,37]).index(e)!=-1;if((f||g)&&!(c.shiftKey||c.altKey||c.ctrlKey)){f?d.step(e==33?10:1,c):g&&d.step(e==34?-10:-1,c);return c.preventDefault()}}}),b.blur(function(b){var c=a(this).val();c!==k&&d.setValue(c,b)}),a.extend(b[0],{stepUp:d.stepUp,stepDown:d.stepDown});function y(){j=c.vertical||f(i,"height")>f(i,"width"),j?(m=f(i,"height")-f(o,"height"),l=i.offset().top+m):(m=f(i,"width")-f(o,"width"),l=i.offset().left)}function z(){y(),d.setValue(c.value!==undefined?c.value:c.min)}z(),m||a(window).load(z)}a.expr[":"].range=function(b){var c=b.getAttribute("type");return c&&c=="range"||a(b).filter("input").data("rangeinput")},a.fn.rangeinput=function(c){if(this.data("rangeinput"))return this;c=a.extend(!0,{},b.conf,c);var d;this.each(function(){var b=new h(a(this),a.extend(!0,{},c)),e=b.getInput().data("rangeinput",b);d=d?d.add(e):e});return d?d:this}})(jQuery); + +// @license-end diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index 3c3c9cc2e..7175d9779 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -1,4 +1,4 @@ - +
diff --git a/view/theme/quattro/unsupported b/view/theme/quattro/unsupported new file mode 100644 index 000000000..e69de29bb diff --git a/view/theme/smoothly/unsupported b/view/theme/smoothly/unsupported new file mode 100644 index 000000000..e69de29bb From e763f57d291cc6cef7e8cd9291872cb6f9f1c216 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 5 Nov 2022 17:54:50 -0400 Subject: [PATCH 2/3] Fix capitalization of unfollow links in Model\Contact --- src/Model/Contact.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7c83e0351..d8fe946fc 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1192,7 +1192,7 @@ class Contact 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false], 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false], 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true], - 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link, true], + 'unfollow'=> [DI::l10n()->t('Unfollow') , $unfollow_link, true], ]; } else { $menu = [ @@ -1203,7 +1203,7 @@ class Contact 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false], 'pm' => [DI::l10n()->t('Send PM') , $pm_url , false], 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true], - 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link , true], + 'unfollow'=> [DI::l10n()->t('Unfollow') , $unfollow_link , true], ]; if (!empty($contact['pending'])) { From c7638e0d0c53232c2be9d166c737a054f224c26a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 5 Nov 2022 18:01:53 -0400 Subject: [PATCH 3/3] Updated main translation file after updating a couple of strings --- view/lang/C/messages.po | 71 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 35b7f879d..c52fa6087 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.12-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-04 08:00-0400\n" +"POT-Creation-Date: 2022-11-05 17:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2073,7 +2073,7 @@ msgstr "" msgid "show more" msgstr "" -#: src/Content/Item.php:295 src/Model/Item.php:2875 +#: src/Content/Item.php:295 src/Model/Item.php:2870 msgid "event" msgstr "" @@ -2082,7 +2082,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:304 src/Model/Item.php:2877 +#: src/Content/Item.php:304 src/Model/Item.php:2872 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" @@ -2441,8 +2441,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1243 src/Model/Item.php:3476 -#: src/Model/Item.php:3482 src/Model/Item.php:3483 +#: src/Content/Text/BBCode.php:1243 src/Model/Item.php:3471 +#: src/Model/Item.php:3477 src/Model/Item.php:3478 msgid "Link to source" msgstr "" @@ -2675,7 +2675,8 @@ msgstr "" msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:461 +#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1195 +#: src/Model/Contact.php:1206 src/Model/Profile.php:461 msgid "Unfollow" msgstr "" @@ -3363,10 +3364,6 @@ msgstr "" msgid "Legacy module file not found: %s" msgstr "" -#: src/Model/Contact.php:1195 src/Model/Contact.php:1206 -msgid "UnFollow" -msgstr "" - #: src/Model/Contact.php:1212 src/Module/Admin/Users/Pending.php:107 #: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:204 @@ -3557,66 +3554,66 @@ msgstr "" msgid "Edit groups" msgstr "" -#: src/Model/Item.php:1987 +#: src/Model/Item.php:1982 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:2879 +#: src/Model/Item.php:2874 msgid "activity" msgstr "" -#: src/Model/Item.php:2881 +#: src/Model/Item.php:2876 msgid "comment" msgstr "" -#: src/Model/Item.php:2884 +#: src/Model/Item.php:2879 msgid "post" msgstr "" -#: src/Model/Item.php:3025 +#: src/Model/Item.php:3020 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3388 +#: src/Model/Item.php:3383 msgid "bytes" msgstr "" -#: src/Model/Item.php:3419 +#: src/Model/Item.php:3414 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3421 +#: src/Model/Item.php:3416 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3426 +#: src/Model/Item.php:3421 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3428 +#: src/Model/Item.php:3423 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3430 +#: src/Model/Item.php:3425 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3464 src/Model/Item.php:3465 +#: src/Model/Item.php:3459 src/Model/Item.php:3460 msgid "View on separate page" msgstr "" @@ -6736,7 +6733,7 @@ msgstr "" msgid "New photo from this URL" msgstr "" -#: src/Module/Contact/Contacts.php:48 src/Module/Conversation/Network.php:186 +#: src/Module/Contact/Contacts.php:48 src/Module/Conversation/Network.php:188 #: src/Module/Group.php:101 msgid "Invalid contact." msgstr "" @@ -7174,53 +7171,53 @@ msgstr "" msgid "Not available." msgstr "" -#: src/Module/Conversation/Network.php:172 +#: src/Module/Conversation/Network.php:174 msgid "No such group" msgstr "" -#: src/Module/Conversation/Network.php:176 +#: src/Module/Conversation/Network.php:178 #, php-format msgid "Group: %s" msgstr "" -#: src/Module/Conversation/Network.php:254 +#: src/Module/Conversation/Network.php:256 msgid "Latest Activity" msgstr "" -#: src/Module/Conversation/Network.php:257 +#: src/Module/Conversation/Network.php:259 msgid "Sort by latest activity" msgstr "" -#: src/Module/Conversation/Network.php:262 +#: src/Module/Conversation/Network.php:264 msgid "Latest Posts" msgstr "" -#: src/Module/Conversation/Network.php:265 +#: src/Module/Conversation/Network.php:267 msgid "Sort by post received date" msgstr "" -#: src/Module/Conversation/Network.php:270 +#: src/Module/Conversation/Network.php:272 msgid "Latest Creation" msgstr "" -#: src/Module/Conversation/Network.php:273 +#: src/Module/Conversation/Network.php:275 msgid "Sort by post creation date" msgstr "" -#: src/Module/Conversation/Network.php:278 +#: src/Module/Conversation/Network.php:280 #: src/Module/Settings/Profile/Index.php:227 msgid "Personal" msgstr "" -#: src/Module/Conversation/Network.php:281 +#: src/Module/Conversation/Network.php:283 msgid "Posts that mention or involve you" msgstr "" -#: src/Module/Conversation/Network.php:286 src/Object/Post.php:350 +#: src/Module/Conversation/Network.php:288 src/Object/Post.php:350 msgid "Starred" msgstr "" -#: src/Module/Conversation/Network.php:289 +#: src/Module/Conversation/Network.php:291 msgid "Favourite Posts" msgstr "" @@ -8111,11 +8108,11 @@ msgstr "" msgid "Show unread" msgstr "" -#: src/Module/Notifications/Ping.php:224 +#: src/Module/Notifications/Ping.php:242 msgid "{0} requested registration" msgstr "" -#: src/Module/Notifications/Ping.php:235 +#: src/Module/Notifications/Ping.php:253 #, php-format msgid "{0} and %d others requested registration" msgstr ""