Loading...
 

Tikiwiki-devel (mailman list mirror)


FW: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[57478] trunk

posts: 829 United Kingdom

Hi - as this was strictly an enhancement and we have now branched for 15.0,
I have only committed this to trunk so far, but I will backport it to
12/14/15 in due course.

It would be 'nice' if this could make it into 15.0 by backporting it earlier
than our protocol 'permits' but it is not particularly essential so it can
wait.

Cheers

g

-----Original Message-----
From: eromneg at users.sourceforge.net mailto:eromneg@users.sourceforge.net
Sent: 08 February 2016 11:45
To: tikiwiki-cvs at lists.sourceforge.net
Subject: Tikiwiki-cvs/svn SF.net SVN: tikiwiki:57478 trunk

Revision: 57478
http://sourceforge.net/p/tikiwiki/code/57478
Author: eromneg
Date: 2016-02-08 11:45:17 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
ENH add new preference to set the default for whether the IMG plugin adds
the img-responsive class - this was 'fixed' as a default of 'y' but an admin
can now set this for their site - this finishes off what was started in
Tiki14

Modified Paths:
--------------
trunk/lib/wiki-plugins/wikiplugin_img.php
trunk/templates/admin/include_look.tpl
trunk/templates/admin/include_textarea.tpl

Added Paths:
-----------
trunk/lib/prefs/image.php

Added: trunk/lib/prefs/image.php
=============


+++ trunk/lib/prefs/image.php 2016-02-08 11:45:17 UTC (rev 57478)

@@ -0,0 +1,18 @@

+<?php +// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware +Project // // All Rights Reserved. See copyright.txt for details and a +complete list of authors. +// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt

for details.

+// $Id$ + +function prefs_image_list() +{ + return array ( + 'image_responsive_class' => array( + 'name' => tra('Default for img-responsive class used

in the IMG plugin'),

+ 'description' => tra('Default option for whether an image

produced with the IMG plugin has the img-responsive class - a plugin
parameter allows this to be overridden'),

+ 'type' => 'flag', + 'default' => 'y', + ), + ); +}


Modified: trunk/lib/wiki-plugins/wikiplugin_img.php
=============


57477)

+++ trunk/lib/wiki-plugins/wikiplugin_img.php 2016-02-08 11:45:17 UTC (rev

57478)
@@ -455,12 +455,13 @@
'required' => false,
'name' => tra('Responsive Image'),
'filter' => 'alpha',
- 'description' => tr('Determines whether the
image has the %0img-responsive%1 class.', '<code>', '</code>'),

+ 'description' => tr('Default set by the

admin using a preference

+and determines whether the image has the %0img-responsive%1 class.', +'<code>', '</code>'),

'since' => '14.0',
'doctype' => 'style',
'advanced' => false,
- 'default' => 'y',

+ 'default' =>

$prefs'image_responsive_class',
'options' => array(

+ array('text' => tra('Default'),

'value' =>

+$prefs'image_responsive_class'),

array('text' => tra('Yes'), 'value'
=> 'y'),
array('text' => tra('No'), 'value'
=> 'n'),
),
@@ -558,7 +559,7 @@
$imgdata'title' = '';
$imgdata'metadata' = '';
$imgdata'alt' = '';
- $imgdata'responsive' = 'y';

+ $imgdata'responsive' = $prefs'image_responsive_class';

$imgdata'default' = '';
$imgdata'mandatory' = '';
$imgdata'fromFieldId' = 0; // "private" params set by
Tracker_Field_Files

Modified: trunk/templates/admin/include_look.tpl
=============


57477)

+++ trunk/templates/admin/include_look.tpl 2016-02-08 11:45:17 UTC (rev

57478)
@@ -220,6 +220,7 @@
\{preference name=iepngfix_selectors\}
\{preference name=iepngfix_elements\}

</div> + \{preference name=image_responsive_class\} <div class="adminoptionbox"> <fieldset>

<legend>\{tr}Favicon{/tr\}</legend>

Modified: trunk/templates/admin/include_textarea.tpl
=============


57477)

+++ trunk/templates/admin/include_textarea.tpl 2016-02-08 11:45:17 UTC (rev

57478)
@@ -152,6 +152,7 @@

<fieldset class="table">

<legend>\{tr}Plugin preferences{/tr\}</legend>
{preference
name=wikipluginprefs_pending_notification}

+ \{preference name=image_responsive_class\} </fieldset>

<fieldset class="table">


This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.


----------------------------------------------------------------------------
--
Site24x7 APM Insight: Get Deep Visibility into Application Performance APM +
Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor
end-to-end web transactions and take corrective actions now Troubleshoot
faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
___
Tikiwiki-cvs mailing list
Tikiwiki-cvs at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs


-----
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2016.0.7357 / Virus Database: 4522/11578 - Release Date: 02/08/16



-----
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2016.0.7357 / Virus Database: 4522/11578 - Release Date: 02/08/16


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
___
TikiWiki-devel mailing list
TikiWiki-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

posts: 126261


Tee hee! Should do this list before the other one really ;)

See my reply there, basically yes, let's test then backport (and maybe move the new pref into a better pref file).

Thanks for observing https://dev.tiki.org/Where+to+commit :-)

jonny



> On 8 Feb 2016, at 12:02, Geoff - Enmore Services <geoff@enmoreservices.com> wrote:
>
> Hi - as this was strictly an enhancement and we have now branched for 15.0,
> I have only committed this to trunk so far, but I will backport it to
> 12/14/15 in due course.
>
> It would be 'nice' if this could make it into 15.0 by backporting it earlier
> than our protocol 'permits' but it is not particularly essential so it can
> wait.
>
> Cheers
>
> g
>
> -----Original Message-----
> From: eromneg at users.sourceforge.net mailto:eromneg@users.sourceforge.net
> Sent: 08 February 2016 11:45
> To: tikiwiki-cvs at lists.sourceforge.net
> Subject: Tikiwiki-cvs/svn SF.net SVN: tikiwiki:57478 trunk
>
> Revision: 57478
> http://sourceforge.net/p/tikiwiki/code/57478
> Author: eromneg
> Date: 2016-02-08 11:45:17 +0000 (Mon, 08 Feb 2016)
> Log Message:
> -----------
> ENH add new preference to set the default for whether the IMG plugin adds
> the img-responsive class - this was 'fixed' as a default of 'y' but an admin
> can now set this for their site - this finishes off what was started in
> Tiki14
>
> Modified Paths:
> --------------
> trunk/lib/wiki-plugins/wikiplugin_img.php
> trunk/templates/admin/include_look.tpl
> trunk/templates/admin/include_textarea.tpl
>
> Added Paths:
> -----------
> trunk/lib/prefs/image.php
>
> Added: trunk/lib/prefs/image.php
> =============
> --- trunk/lib/prefs/image.php (rev 0)
> +++ trunk/lib/prefs/image.php 2016-02-08 11:45:17 UTC (rev 57478)
> @@ -0,0 +1,18 @@
> +<?php
> +// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware
> +Project // // All Rights Reserved. See copyright.txt for details and a
> +complete list of authors.
> +// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt
> for details.
> +// $Id$
> +
> +function prefs_image_list()
> +{
> + return array (
> + 'image_responsive_class' => array(
> + 'name' => tra('Default for img-responsive class used
> in the IMG plugin'),
> + 'description' => tra('Default option for whether an image
> produced with the IMG plugin has the img-responsive class - a plugin
> parameter allows this to be overridden'),
> + 'type' => 'flag',
> + 'default' => 'y',
> + ),
> + );
> +}
>
> Modified: trunk/lib/wiki-plugins/wikiplugin_img.php
> =============
> --- trunk/lib/wiki-plugins/wikiplugin_img.php 2016-02-07 18:52:55 UTC (rev
> 57477)
> +++ trunk/lib/wiki-plugins/wikiplugin_img.php 2016-02-08 11:45:17 UTC (rev
> 57478)
> @@ -455,12 +455,13 @@
> 'required' => false,
> 'name' => tra('Responsive Image'),
> 'filter' => 'alpha',
> - 'description' => tr('Determines whether the
> image has the %0img-responsive%1 class.', '<code>', '</code>'),
> + 'description' => tr('Default set by the
> admin using a preference
> +and determines whether the image has the %0img-responsive%1 class.',
> +'<code>', '</code>'),
> 'since' => '14.0',
> 'doctype' => 'style',
> 'advanced' => false,
> - 'default' => 'y',
>
> + 'default' =>
> $prefs'image_responsive_class',
> 'options' => array(
> + array('text' => tra('Default'),
> 'value' =>
> +$prefs'image_responsive_class'),
> array('text' => tra('Yes'), 'value'
> => 'y'),
> array('text' => tra('No'), 'value'
> => 'n'),
> ),
> @@ -558,7 +559,7 @@
> $imgdata'title' = '';
> $imgdata'metadata' = '';
> $imgdata'alt' = '';
> - $imgdata'responsive' = 'y';
> + $imgdata'responsive' = $prefs'image_responsive_class';
> $imgdata'default' = '';
> $imgdata'mandatory' = '';
> $imgdata'fromFieldId' = 0; // "private" params set by
> Tracker_Field_Files
>
> Modified: trunk/templates/admin/include_look.tpl
> =============
> --- trunk/templates/admin/include_look.tpl 2016-02-07 18:52:55 UTC (rev
> 57477)
> +++ trunk/templates/admin/include_look.tpl 2016-02-08 11:45:17 UTC (rev
> 57478)
> @@ -220,6 +220,7 @@
> \{preference name=iepngfix_selectors\}
> \{preference name=iepngfix_elements\}

> </div>

> + \{preference name=image_responsive_class\}

> <div class="adminoptionbox"> > <fieldset>

> <legend>\{tr}Favicon{/tr\}</legend>
>
> Modified: trunk/templates/admin/include_textarea.tpl
> =============
> --- trunk/templates/admin/include_textarea.tpl 2016-02-07 18:52:55 UTC (rev
> 57477)
> +++ trunk/templates/admin/include_textarea.tpl 2016-02-08 11:45:17 UTC (rev
> 57478)
> @@ -152,6 +152,7 @@

> <fieldset class="table">

> <legend>\{tr}Plugin preferences{/tr\}</legend>
> {preference
> name=wikipluginprefs_pending_notification}
> + \{preference name=image_responsive_class\}

> </fieldset>

>

> <fieldset class="table">

>
> This was sent by the SourceForge.net collaborative development platform, the
> world's largest Open Source development site.
>
>
> ----------------------------------------------------------------------------
> --
> Site24x7 APM Insight: Get Deep Visibility into Application Performance APM +
> Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor
> end-to-end web transactions and take corrective actions now Troubleshoot
> faster and improve end-user experience. Signup Now!
> http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
> ___
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>
>
> -----
> No virus found in this message.
> Checked by AVG - www.avg.com
> Version: 2016.0.7357 / Virus Database: 4522/11578 - Release Date: 02/08/16
>
>
>
> -----
> No virus found in this message.
> Checked by AVG - www.avg.com
> Version: 2016.0.7357 / Virus Database: 4522/11578 - Release Date: 02/08/16
>
>
> ------------------------------------------------------------------------------
> Site24x7 APM Insight: Get Deep Visibility into Application Performance
> APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
> Monitor end-to-end web transactions and take corrective actions now
> Troubleshoot faster and improve end-user experience. Signup Now!
> http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
> ___
> TikiWiki-devel mailing list
> TikiWiki-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
___
TikiWiki-devel mailing list
TikiWiki-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel


Why Register?

Register at tiki.org and you'll be able to use the account at any *.tiki.org site, thanks to the InterTiki feature. A valid email address is required to receive site notifications and occasional newsletters. You can opt out of these items at any time.