[commits] Horde branch develop updated. 9e1b583e045ca572ac8d3af883818a493c869a0b

[Michael M Slusarz]

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

from: 8353e6dadf75df3eef478ee6eabd9d90be8af8c6

3e55835 Only load CSS necessary for portal blocks, if application supports it
a27a516 Convert IMP to new Block CSS code
e85cc50 Convert Ingo to new Block Css code
45d14e4 Convert Turba to new Block CSS code
9e1b583 Merge branch 'block' into develop

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

commit 3e558356c67614557e405c462b7813659e2de981
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 2 12:55:36 2011 -0600

    Only load CSS necessary for portal blocks, if application supports it

 framework/Core/lib/Horde/Core/Block/Layout/View.php |   31 +++++++++++++++++++
 framework/Core/package.xml                          |   19 ++----------
 horde/docs/CHANGES                                  |    8 +++++
 horde/services/portal/index.php                     |    6 ++--
 4 files changed, 45 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/3e558356c67614557e405c462b7813659e2de981

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

commit a27a516addb0d3be4edccb487873a54b3a3ad269
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 2 17:35:52 2011 -0600

    Convert IMP to new Block CSS code

 imp/themes/default/block/screen.css |    9 +++++++++
 imp/themes/default/screen.css       |   10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 imp/themes/default/block/screen.css

http://git.horde.org/horde-git/-/commit/a27a516addb0d3be4edccb487873a54b3a3ad269

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

commit e85cc50d7d0d86e8709703140b30c1205f44e5ec
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 2 17:36:09 2011 -0600

    Convert Ingo to new Block Css code

 ingo/lib/Block/Overview.php          |   40 ++++++++++++++++++---------------
 ingo/themes/default/block/screen.css |   25 +++++++++++++++++++++
 ingo/themes/silver/block/screen.css  |   15 ++++++++++++
 3 files changed, 62 insertions(+), 18 deletions(-)
 create mode 100644 ingo/themes/default/block/screen.css
 create mode 100644 ingo/themes/silver/block/screen.css

http://git.horde.org/horde-git/-/commit/e85cc50d7d0d86e8709703140b30c1205f44e5ec

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

commit 45d14e434567a23a3ebf30460171809efa8305a2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 2 17:36:17 2011 -0600

    Convert Turba to new Block CSS code
    
    Clean up minisearch block while here - javascript should all be loaded
    via separate, cacheable file.
    Use sprite for loading graphic.

 turba/js/minisearch.js                    |   35 +++++++++++++++++++++++++++++
 turba/lib/Block/Minisearch.php            |   22 ++++++++++--------
 turba/templates/block/minisearch.inc      |   34 +++++++++-------------------
 turba/themes/default/block/screen.css     |    8 ++++++
 turba/themes/default/graphics/loading.gif |  Bin 0 -> 1737 bytes
 5 files changed, 66 insertions(+), 33 deletions(-)
 create mode 100644 turba/js/minisearch.js
 create mode 100644 turba/themes/default/block/screen.css
 create mode 100644 turba/themes/default/graphics/loading.gif

http://git.horde.org/horde-git/-/commit/45d14e434567a23a3ebf30460171809efa8305a2

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

commit 9e1b583e045ca572ac8d3af883818a493c869a0b
Merge: 8353e6d 45d14e4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 2 17:47:38 2011 -0600

    Merge branch 'block' into develop
    
    Conflicts:
    	horde/docs/CHANGES

 framework/Core/lib/Horde/Core/Block/Layout/View.php |   31 ++++++++++++++
 framework/Core/package.xml                          |   19 +-------
 horde/docs/CHANGES                                  |    3 +
 horde/services/portal/index.php                     |    6 +-
 imp/themes/default/block/screen.css                 |    9 ++++
 imp/themes/default/screen.css                       |   10 -----
 ingo/lib/Block/Overview.php                         |   40 ++++++++++--------
 ingo/themes/default/block/screen.css                |   25 ++++++++++++
 ingo/themes/silver/block/screen.css                 |   15 +++++++
 turba/js/minisearch.js                              |   35 ++++++++++++++++
 turba/lib/Block/Minisearch.php                      |   22 ++++++-----
 turba/templates/block/minisearch.inc                |   34 +++++-----------
 turba/themes/default/block/screen.css               |    8 ++++
 turba/themes/default/graphics/loading.gif           |  Bin 0 -> 1737 bytes
 14 files changed, 177 insertions(+), 80 deletions(-)

http://git.horde.org/horde-git/-/commit/9e1b583e045ca572ac8d3af883818a493c869a0b