#1217203 by Jay Allen (jay)

Theme:
$ git co -b byrnereese-bug-388-fix-plugin-screen byrnereese/bug-388-fix-plugin-screen
Branch byrnereese-bug-388-fix-plugin-screen set up to track remote branch bug-388-fix-plugin-screen from byrnereese.
Switched to a new branch 'byrnereese-bug-388-fix-plugin-screen'

$ git log
commit 20dee58af51ce2c1e21573c517e112d3d9275b19
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 17:03:50 2010 -0700

    Updated to latest version of Config Assistant which improves cross Melody and MT compatibility.

commit b973073a07a81e22d0dd4686bf48080df5da1c52
Merge: fe8779f e2e2d03
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 17:03:10 2010 -0700

    Merge branch 'master' of github.com:byrnereese/melody into bug-388-fix-plugin-screen

commit fe8779f3da04c3e1f1bac42b56a945d2a1a09d32
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 16:57:22 2010 -0700

    Remove spacing in order to improve compatibility with config assistant

commit 4bf26a43238b8bb6b3b394ec06a2a631cc911d7c
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 15:15:48 2010 -0700

    Changed "Plugins" in the Preferences menu to "Plugin Settings" to be more symmetical with "Blog Settings"

commit e2e2d030c6969ff0b557982a8f1424142c1654d9
Author: Jay Allen <jay@endevver.com>
Date:   Mon Oct 11 10:39:44 2010 -0700

    Melody v0.9.22 - Many Melody Cleanup checkins from byrnereese, tima, mikert and new contributor therigu.  See latest test results in t/results/prove-v0.9.22.log


$ git reset --hard e2e2d030c6969ff0b557982a8f1424142c1654d9
HEAD is now at e2e2d03 Melody v0.9.22 - Many Melody Cleanup checkins from byrnereese, tima, mikert and new contributor therigu.  See latest test results in t/results/prove-v0.9.22.log

$ git cherry-pick 4bf26a43238b8bb6b3b394ec06a2a631cc911d7c
[byrnereese-bug-388-fix-plugin-screen 01f9c7f] Changed "Plugins" in the Preferences menu to "Plugin Settings" to be more symmetical with "Blog Settings"
 Author: Byrne <byrne@majordojo.com>
 1 files changed, 1 insertions(+), 1 deletions(-)

$ git cherry-pick fe8779f3da04c3e1f1bac42b56a945d2a1a09d32
[byrnereese-bug-388-fix-plugin-screen 93d041e] Remove spacing in order to improve compatibility with config assistant
 Author: Byrne <byrne@majordojo.com>
 1 files changed, 1 insertions(+), 2 deletions(-)

$ git cherry-pick 20dee58af51ce2c1e21573c517e112d3d9275b19
[byrnereese-bug-388-fix-plugin-screen e3b3cce] Updated to latest version of Config Assistant which improves cross Melody and MT compatibility.
 Author: Byrne <byrne@majordojo.com>
 5 files changed, 56 insertions(+), 51 deletions(-)
 create mode 100644 addons/ConfigAssistant.plugin/static/js/options.js

$ git log
commit e3b3ccec3f79f166c69733a48c6d285fa19913e7
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 17:03:50 2010 -0700

    Updated to latest version of Config Assistant which improves cross Melody and MT compatibility.

commit 93d041eb506a13e6ce245286f779e52e1493be98
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 16:57:22 2010 -0700

    Remove spacing in order to improve compatibility with config assistant

commit 01f9c7f8ad809c0f1112ff3d2554e38d052a0dc2
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 15:15:48 2010 -0700

    Changed "Plugins" in the Preferences menu to "Plugin Settings" to be more symmetical with "Blog Settings"

commit e2e2d030c6969ff0b557982a8f1424142c1654d9
Author: Jay Allen <jay@endevver.com>
Date:   Mon Oct 11 10:39:44 2010 -0700

    Melody v0.9.22 - Many Melody Cleanup checkins from byrnereese, tima, mikert and new contributor therigu.  See latest test results in t/results/prove-v0.9.22.log


$ git rebase -i e2e2d030c6969ff0b557982a8f1424142c1654d9
[detached HEAD e67d369] [#388 state:committed] Changed "Plugins" in the Preferences menu to "Plugin Settings" to be more symmetrical with "Blog Settings"
 Author: Byrne <byrne@majordojo.com>
 1 files changed, 1 insertions(+), 1 deletions(-)
[detached HEAD 5c1de5e] [#388 state:committed] Remove spacing in order to improve compatibility with config assistant
 Author: Byrne <byrne@majordojo.com>
 1 files changed, 1 insertions(+), 2 deletions(-)
[detached HEAD f4ef495] [#388 state:resolved] Updated to latest version of Config Assistant which improves cross Melody and MT compatibility.
 Author: Byrne <byrne@majordojo.com>
 5 files changed, 56 insertions(+), 51 deletions(-)
 create mode 100644 addons/ConfigAssistant.plugin/static/js/options.js
Successfully rebased and updated refs/heads/byrnereese-bug-388-fix-plugin-screen.

$ git log
commit f4ef495f05ec4e6405aac88c7c380ca7c93a0433
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 17:03:50 2010 -0700

    [#388 state:resolved] Updated to latest version of Config Assistant which improves cross Melody and MT compatibility.

commit 5c1de5e944683029a94f868248280a6434ef5160
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 16:57:22 2010 -0700

    [#388 state:committed] Remove spacing in order to improve compatibility with config assistant

commit e67d36906d6ff07d3e529358f2c2b5f9983c3558
Author: Byrne <byrne@majordojo.com>
Date:   Tue Oct 12 15:15:48 2010 -0700

    [#388 state:committed] Changed "Plugins" in the Preferences menu to "Plugin Settings" to be more symmetrical with "Blog Settings"

commit e2e2d030c6969ff0b557982a8f1424142c1654d9
Author: Jay Allen <jay@endevver.com>
Date:   Mon Oct 11 10:39:44 2010 -0700

    Melody v0.9.22 - Many Melody Cleanup checkins from byrnereese, tima, mikert and new contributor therigu.  See latest test results in t/results/prove-v0.9.22.log

$ git merge byrnereese-bug-388-fix-plugin-screen 
Updating e2e2d03..f4ef495
Fast-forward
 addons/ConfigAssistant.plugin/config.yaml          |    4 +-
 .../lib/ConfigAssistant/Plugin.pm                  |   10 +++-
 addons/ConfigAssistant.plugin/static/js/app.js     |   46 --------------------
 addons/ConfigAssistant.plugin/static/js/options.js |   46 ++++++++++++++++++++
 .../ConfigAssistant.plugin/tmpl/theme_options.mtml |    1 +
 lib/MT/App/CMS.pm                                  |    2 +-
 tmpl/cms/cfg_plugin.tmpl                           |    3 +-
 7 files changed, 58 insertions(+), 54 deletions(-)
 create mode 100644 addons/ConfigAssistant.plugin/static/js/options.js