Skip to content

Commit

Permalink
Item11553: modify layout of the Extensions tab.
Browse files Browse the repository at this point in the history
Trying a different layout for the Extensions management.

Combine all of the options for how Foswiki loads, installs, and enables
plugins under a single tab.

Also update the "Install / Update" button to also list remove.

git-svn-id: http://svn.foswiki.org/branches/Release01x01@14276 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Mar 11, 2012
1 parent ee9b6b1 commit 5a8e22b
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 28 deletions.
60 changes: 34 additions & 26 deletions core/lib/Foswiki.spec
Expand Up @@ -1598,9 +1598,38 @@ $Foswiki::cfg{Operators}{If} = [ 'Foswiki::If::OP_allows', 'Foswiki::If::OP_defi
#---+ Extensions -- TABS
#---++ Install and update extensions
# <p>Consult online extensions repositories for new extensions, or check and manage updates.</p>
#---++ Plugin Operation and Maintenance
# <p>General configuration and maintenance of extensions.
# <ul><li>Specify the plugin load order.
# <li>Use the Extensions Repository to add, update or remove plugins.
# <li>Enable and disable installed plugins.
# </ul>
#---+++ Configure how plugins are loaded by Foswiki
# **STRING 80**
# Plugins evaluation order. If set to a comma-separated list of plugin names,
# will change the execution order of plugins so the listed subset of plugins
# are executed first. The default execution order is alphabetical on plugin
# name. <br/><br/>
#
# If TWiki compatibility is required, TWikiCompatibilityPlugin should be the first
# Plugin in the list. SpreadSheetPlugin should typically be next in the list for proper operation.<br/><br/>
#
# Note that some other general extension environment checks are made and reported here. Plugins
# that are enabled but not installed and duplicate plugins in the TWiki and Foswiki libraries
# are reported here. Also if a TWiki plugin is enabled and the Foswik version is installed, this
# will also be reported here. Expand the "Expert" options to find these issues.
#
$Foswiki::cfg{PluginsOrder} = 'TWikiCompatibilityPlugin,SpreadSheetPlugin';
# **STRING 80 EXPERT**
# Search path (web names) for plugin topics. Note that the current web
# is searched last, after this list. Most modern foswiki plugins do not
# use the plugin topic for settings, and this setting is ignored. It is
# recommended that this setting not be changed.
$Foswiki::cfg{Plugins}{WebSearchPath} = '$Foswiki::cfg{SystemWebName},TWiki';
#---+++ Install, Update or Remove extensions
# **STRING 80 EXPERT**
# <b>Extensions Repositories Search List</b><br />
# Foswiki extension repositories are just Foswiki webs that are organised in the
Expand Down Expand Up @@ -1634,37 +1663,16 @@ $Foswiki::cfg{ExtensionsRepositories} = 'Foswiki.org=(http://foswiki.org/Extensi

# *FINDEXTENSIONS* Marker used by bin/configure script - do not remove!

#---+++ Enable or disable installed extensions

#---++ Plugin operation (Enable / Disable)
# *PLUGINS* Marker used by bin/configure script - do not remove!
# <p>The plugins listed below were discovered by searching the <code>@INC</code>
# path for modules that match the Foswiki standard e.g.
# <code>Foswiki/Plugins/MyPlugin.pm</code> or the TWiki standard i.e.
# <code>TWiki/Plugins/YourPlugin.pm</code></p>
# <code>TWiki/Plugins/YourPlugin.pm</code> Note that this list
# is only for Plugins. You cannot Enable/Disable Contribs, AddOns or Skins.</p>
# <p>Any plugins enabled in the configuration but not found in the <code>@INC</code>
# path are listed at the end and are flagged as errors in the PluginsOrder check.</p>
# **STRING 80**
# Plugins evaluation order. If set to a comma-separated list of plugin names,
# will change the execution order of plugins so the listed subset of plugins
# are executed first. The default execution order is alphabetical on plugin
# name. <br/><br/>
#
# If TWiki compatibility is required, TWikiCompatibilityPlugin should be the first
# Plugin in the list. SpreadSheetPlugin should typically be next in the list for proper operation.<br/><br/>
#
# Note that some other general extension environment checks are made and reported here. Plugins
# that are enabled but not installed and duplicate plugins in the TWiki and Foswiki libraries
# are reported here. Also if a TWiki plugin is enabled and the Foswik version is installed, this
# will also be reported here. Expand the "Expert" options to find these issues.
#
$Foswiki::cfg{PluginsOrder} = 'TWikiCompatibilityPlugin,SpreadSheetPlugin';

# **STRING 80 EXPERT**
# Search path (web names) for plugin topics. Note that the current web
# is searched last, after this list. Most modern foswiki plugins do not
# use the plugin topic for settings, and this setting is ignored.
$Foswiki::cfg{Plugins}{WebSearchPath} = '$Foswiki::cfg{SystemWebName},TWiki';


$Foswiki::cfg{Plugins}{PreferencesPlugin}{Enabled} = 1;
$Foswiki::cfg{Plugins}{PreferencesPlugin}{Module} = 'Foswiki::Plugins::PreferencesPlugin';
Expand Down
4 changes: 2 additions & 2 deletions core/lib/Foswiki/Configure/templates/findextensionsintro.tmpl
Expand Up @@ -11,11 +11,11 @@
<#assign localOkMessage>
<div class='foswikiNotification enableWhenSomethingChanged foswikiHidden'>
<span class="foswikiAlert"><strong>You made some changes! Consider saving them first.</strong></span>
Otherwise click to <a href='${scriptName}?action=FindMoreExtensions' class='foswikiButton'>Install and Update Extensions</a>
Otherwise click to <a href='${scriptName}?action=FindMoreExtensions' class='foswikiButton'>Install, Update and Remove Extensions</a>
</div>
<div class='foswikiNotification showWhenNothingChanged'>
<strong>If you have made any changes, consider saving them first.</strong>
<a href='${scriptName}?action=FindMoreExtensions' class='foswikiButton'>Install and Update Extensions</a>
<a href='${scriptName}?action=FindMoreExtensions' class='foswikiButton'>Install, Update and Remove Extensions</a>
</div>
</#assign>

Expand Down

0 comments on commit 5a8e22b

Please sign in to comment.