[commits] Horde branch H4-Jonah updated. 52f7f22598c20c104cc38368faa6987955a88146

Michael Rubinsky mike at theupstairsroom.com
Thu Jul 15 21:48:45 UTC 2010 

The branch "H4-Jonah" has been updated.
The following is a summary of the commits.

from: 2a6760a484a70cd43f20e89b8013c253ea181791

419ca9a Hopefully the last of the Jonah_News usage is now removed.
d7095ab Horde_View for the stories index page.
b7bec9e only show sidebar if not in an ajax view
02a19da Horde_View style templating for story view.
52f7f22 simplify

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

commit 419ca9a3e914198d649c387330b87e5f86c50a08
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 14 16:14:58 2010 -0400

    Hopefully the last of the Jonah_News usage is now removed.

 jonah/channels/edit.php    |    2 +-
 jonah/lib/Api.php          |  128 ++++++++++++++++++++++----------------------
 jonah/lib/Application.php  |   12 +----
 jonah/lib/Block/cloud.php  |   12 ++---
 jonah/lib/Block/latest.php |   38 +++++++------
 jonah/lib/Driver.php       |    4 +-
 jonah/lib/Driver/Sql.php   |   46 +++++++++-------
 jonah/lib/Form/Feed.php    |    4 +-
 jonah/lib/Jonah.php        |   64 +++++++++++++++++++---
 jonah/stories/delete.php   |   66 ++++++++--------------
 jonah/stories/index.php    |   59 ++++++++------------
 jonah/stories/pdf.php      |   27 +++++----
 jonah/stories/results.php  |   63 +++++++++++-----------
 jonah/stories/share.php    |   29 ++++++----
 jonah/stories/view.php     |   57 +++++++++----------
 15 files changed, 315 insertions(+), 296 deletions(-)

http://git.horde.org/diff.php/jonah/channels/edit.php?rt=horde-git&r1=968d42008125617bee6c1a834a10678ca86a9fc0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Api.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Application.php?rt=horde-git&r1=5741c100721dce98ca39cb2d37715a61383ff85c&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Block/cloud.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Block/latest.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Driver.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Driver/Sql.php?rt=horde-git&r1=2a6760a484a70cd43f20e89b8013c253ea181791&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Form/Feed.php?rt=horde-git&r1=968d42008125617bee6c1a834a10678ca86a9fc0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/lib/Jonah.php?rt=horde-git&r1=7ffd42aab69fe45dafa275848ecb886fe2417d71&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/stories/delete.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/stories/index.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/stories/pdf.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/stories/results.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/stories/share.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08
http://git.horde.org/diff.php/jonah/stories/view.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=419ca9a3e914198d649c387330b87e5f86c50a08

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

commit d7095ab0cc85050f4185db0be1b5567fe933e8d0
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 15 13:47:54 2010 -0400

    Horde_View for the stories index page.
    
    This just moves existing templates to Horde_View, still need to
    rethink the layout, use of renderPartial, helpers etc...

 jonah/stories/index.php                |   28 +++++----------
 jonah/templates/stories/index.html     |   58 --------------------------------
 jonah/templates/stories/index.html.php |   50 +++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 76 deletions(-)
 delete mode 100644 jonah/templates/stories/index.html
 create mode 100644 jonah/templates/stories/index.html.php

http://git.horde.org/diff.php/jonah/stories/index.php?rt=horde-git&r1=419ca9a3e914198d649c387330b87e5f86c50a08&r2=d7095ab0cc85050f4185db0be1b5567fe933e8d0
http://git.horde.org/diff.php/jonah/templates/stories/index.html?rt=horde-git&r1=d80e67854208b7bc13b1002103a7104c4d83c7c5&r2=d7095ab0cc85050f4185db0be1b5567fe933e8d0
http://git.horde.org/co.php/jonah/templates/stories/index.html.php?rt=horde-git&r=d7095ab0cc85050f4185db0be1b5567fe933e8d0

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

commit b7bec9e96df0ec6d77a70f05896fae72ed0ca4bd
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 15 13:48:52 2010 -0400

    only show sidebar if not in an ajax view

 jonah/templates/menu.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/jonah/templates/menu.inc?rt=horde-git&r1=968d42008125617bee6c1a834a10678ca86a9fc0&r2=b7bec9e96df0ec6d77a70f05896fae72ed0ca4bd

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

commit 02a19dafff869dbc187a5c2dc3d8ad301aaf8fab
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 15 17:39:41 2010 -0400

    Horde_View style templating for story view.

 jonah/stories/view.php                          |   32 +++++++---------------
 jonah/templates/stories/layout/view.html.php    |   28 ++++++++++++++++++++
 jonah/templates/stories/partial/_story.html.php |   17 ++++++++++++
 jonah/templates/stories/story.html              |   15 ----------
 jonah/templates/stories/view.html               |   25 ------------------
 5 files changed, 55 insertions(+), 62 deletions(-)
 create mode 100644 jonah/templates/stories/layout/view.html.php
 create mode 100644 jonah/templates/stories/partial/_story.html.php
 delete mode 100644 jonah/templates/stories/story.html
 delete mode 100644 jonah/templates/stories/view.html

http://git.horde.org/diff.php/jonah/stories/view.php?rt=horde-git&r1=419ca9a3e914198d649c387330b87e5f86c50a08&r2=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab
http://git.horde.org/co.php/jonah/templates/stories/layout/view.html.php?rt=horde-git&r=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab
http://git.horde.org/co.php/jonah/templates/stories/partial/_story.html.php?rt=horde-git&r=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab
http://git.horde.org/diff.php/jonah/templates/stories/story.html?rt=horde-git&r1=d80e67854208b7bc13b1002103a7104c4d83c7c5&r2=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab
http://git.horde.org/diff.php/jonah/templates/stories/view.html?rt=horde-git&r1=d80e67854208b7bc13b1002103a7104c4d83c7c5&r2=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab

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

commit 52f7f22598c20c104cc38368faa6987955a88146
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 15 17:47:16 2010 -0400

    simplify

 jonah/stories/edit.php    |   21 +++------------------
 jonah/stories/results.php |    2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)

http://git.horde.org/diff.php/jonah/stories/edit.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=52f7f22598c20c104cc38368faa6987955a88146
http://git.horde.org/diff.php/jonah/stories/results.php?rt=horde-git&r1=419ca9a3e914198d649c387330b87e5f86c50a08&r2=52f7f22598c20c104cc38368faa6987955a88146

More information about the commits mailing list