[commits] Horde branch master updated. 2d0803caf4f3a86be86ae1f646ca52f2b197e463

[Michael M Slusarz]

The branch "master" has been updated.
The following is a summary of the commits.

from: e5fac1cbf5e8b0f8b5255ece7b08e178b7b95a89

35855a8 Improved handling of views in help XML files
2d3c101 Use new unified help.xml file format
2d0803c Can nest these kind of tags now in help files

-----------------------------------------------------------------------

commit 35855a865c6fb803a47056cb7606ce3c51ddc33d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 22 12:14:39 2012 -0600

    Improved handling of views in help XML files
    
    Duh Michael. Don't use separate XML files for different data types. Use
    the feature that is (one of) the reasons we are using XML in the first
    place: the method to nest data entries under a parent data entry.
    
    View specific help data now appears under the <view id="[view]"> tag.
    <entry> tags that live directly under the base <help> tag are treated as
    common entries for all views, and should allow existing help files to be BC.
    
    Additionally, since SimpleXML doesn't natively do what we need it to do,
    remove XPath munging and just use the direct DOM elements. Benefit:
    allows us to nest UI output elements (i.e. we can now nest CSS elements in
    warning blocks).

 framework/Core/lib/Horde/Help.php |  247 +++++++++++++++++--------------------
 horde/services/help/index.php     |   26 ++---
 2 files changed, 125 insertions(+), 148 deletions(-)

http://git.horde.org/horde-git/-/commit/35855a865c6fb803a47056cb7606ce3c51ddc33d

-----------------------------------------------------------------------

commit 2d3c1010bcd0d3a757979990a19bb3d30859fcfc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 22 12:18:24 2012 -0600

    Use new unified help.xml file format

 imp/locale/en/help.xml         |  282 ++++++++++++++++++++++++++++++++++++++++
 imp/locale/en/help_basic.xml   |  204 -----------------------------
 imp/locale/en/help_dynamic.xml |   78 -----------
 imp/package.xml                |   10 +-
 4 files changed, 285 insertions(+), 289 deletions(-)
 delete mode 100644 imp/locale/en/help_basic.xml
 delete mode 100644 imp/locale/en/help_dynamic.xml

http://git.horde.org/horde-git/-/commit/2d3c1010bcd0d3a757979990a19bb3d30859fcfc

-----------------------------------------------------------------------

commit 2d0803caf4f3a86be86ae1f646ca52f2b197e463
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 22 12:19:45 2012 -0600

    Can nest these kind of tags now in help files

 imp/locale/en/help.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/2d0803caf4f3a86be86ae1f646ca52f2b197e463