[commits] Horde branch H4-Jonah updated. 6bd49d1c31bca54c9fbf9af8a3fe6912af4a3588
Michael Rubinsky
mike at theupstairsroom.com
Fri Jul 16 21:22:47 UTC 2010
The branch "H4-Jonah" has been updated.
The following is a summary of the commits.
from: 913f7069b25fd3a481de761163815d6ea4c23f59
94bb499 Resolve conflict - missed this during last merge.
0775dea remove deprecated method
c2fe084 Start adding formal Jonah_View classes.
9b72046 this method needs to take an array
348406b ChannelDelete view
37c65c5 view for channel editing
80205df story lists and story views to Jonah_View
691cf25 move story editing to a view object.
4d0ba9c story deletion view
6bd49d1 pdf generation view
-----------------------------------------------------------------------
commit 94bb499433bb89ea263a4b000bf0b37fb0848aeb
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 11:14:18 2010 -0400
Resolve conflict - missed this during last merge.
jonah/lib/Driver.php | 12 +-----------
jonah/lib/Driver/Sql.php | 33 +++++++--------------------------
2 files changed, 8 insertions(+), 37 deletions(-)
http://git.horde.org/diff.php/jonah/lib/Driver.php?rt=horde-git&r1=913f7069b25fd3a481de761163815d6ea4c23f59&r2=94bb499433bb89ea263a4b000bf0b37fb0848aeb
http://git.horde.org/diff.php/jonah/lib/Driver/Sql.php?rt=horde-git&r1=913f7069b25fd3a481de761163815d6ea4c23f59&r2=94bb499433bb89ea263a4b000bf0b37fb0848aeb
-----------------------------------------------------------------------
commit 0775dea7ea23c4d2dbbfc16f19914225d5103ff2
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 11:18:42 2010 -0400
remove deprecated method
jonah/lib/Driver.php | 49 -------------------------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
http://git.horde.org/diff.php/jonah/lib/Driver.php?rt=horde-git&r1=94bb499433bb89ea263a4b000bf0b37fb0848aeb&r2=0775dea7ea23c4d2dbbfc16f19914225d5103ff2
-----------------------------------------------------------------------
commit c2fe084894ad8421a274ca0257da090b5146d047
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 13:56:49 2010 -0400
Start adding formal Jonah_View classes.
This adds the channel list view.
jonah/channels/index.php | 50 +------------------
jonah/lib/View/Base.php | 40 +++++++++++++++
jonah/lib/View/ChannelList.php | 75 +++++++++++++++++++++++++++++
jonah/templates/channels/index.html.php | 54 ---------------------
jonah/templates/common-header.inc | 2 +-
jonah/templates/view/channellist.html.php | 54 +++++++++++++++++++++
6 files changed, 172 insertions(+), 103 deletions(-)
create mode 100644 jonah/lib/View/Base.php
create mode 100644 jonah/lib/View/ChannelList.php
delete mode 100644 jonah/templates/channels/index.html.php
create mode 100644 jonah/templates/view/channellist.html.php
http://git.horde.org/diff.php/jonah/channels/index.php?rt=horde-git&r1=968d42008125617bee6c1a834a10678ca86a9fc0&r2=c2fe084894ad8421a274ca0257da090b5146d047
http://git.horde.org/co.php/jonah/lib/View/Base.php?rt=horde-git&r=c2fe084894ad8421a274ca0257da090b5146d047
http://git.horde.org/co.php/jonah/lib/View/ChannelList.php?rt=horde-git&r=c2fe084894ad8421a274ca0257da090b5146d047
http://git.horde.org/diff.php/jonah/templates/channels/index.html.php?rt=horde-git&r1=968d42008125617bee6c1a834a10678ca86a9fc0&r2=c2fe084894ad8421a274ca0257da090b5146d047
http://git.horde.org/diff.php/jonah/templates/common-header.inc?rt=horde-git&r1=a0ce9ace9c3114b59d4926dd43c89cd19f4794c4&r2=c2fe084894ad8421a274ca0257da090b5146d047
http://git.horde.org/co.php/jonah/templates/view/channellist.html.php?rt=horde-git&r=c2fe084894ad8421a274ca0257da090b5146d047
-----------------------------------------------------------------------
commit 9b72046aa762f45d58c639d928d8d8825c793f9c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 13:57:40 2010 -0400
this method needs to take an array
jonah/lib/Driver/Sql.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
http://git.horde.org/diff.php/jonah/lib/Driver/Sql.php?rt=horde-git&r1=94bb499433bb89ea263a4b000bf0b37fb0848aeb&r2=9b72046aa762f45d58c639d928d8d8825c793f9c
-----------------------------------------------------------------------
commit 348406b09781fd0868ab0b804af3ccfe9556c79f
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 14:56:41 2010 -0400
ChannelDelete view
jonah/channels/delete.php | 59 ++------------------------
jonah/channels/index.php | 7 +++-
jonah/lib/View/ChannelDelete.php | 85 ++++++++++++++++++++++++++++++++++++++
jonah/lib/View/ChannelList.php | 6 +-
4 files changed, 99 insertions(+), 58 deletions(-)
create mode 100644 jonah/lib/View/ChannelDelete.php
http://git.horde.org/diff.php/jonah/channels/delete.php?rt=horde-git&r1=968d42008125617bee6c1a834a10678ca86a9fc0&r2=348406b09781fd0868ab0b804af3ccfe9556c79f
http://git.horde.org/diff.php/jonah/channels/index.php?rt=horde-git&r1=c2fe084894ad8421a274ca0257da090b5146d047&r2=348406b09781fd0868ab0b804af3ccfe9556c79f
http://git.horde.org/co.php/jonah/lib/View/ChannelDelete.php?rt=horde-git&r=348406b09781fd0868ab0b804af3ccfe9556c79f
http://git.horde.org/diff.php/jonah/lib/View/ChannelList.php?rt=horde-git&r1=c2fe084894ad8421a274ca0257da090b5146d047&r2=348406b09781fd0868ab0b804af3ccfe9556c79f
-----------------------------------------------------------------------
commit 37c65c5b819bba634686bd1ddfbb4ce5d46f0fc6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 15:14:03 2010 -0400
view for channel editing
jonah/channels/edit.php | 65 +++---------------------------
jonah/lib/View/ChannelEdit.php | 85 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 59 deletions(-)
create mode 100644 jonah/lib/View/ChannelEdit.php
http://git.horde.org/diff.php/jonah/channels/edit.php?rt=horde-git&r1=419ca9a3e914198d649c387330b87e5f86c50a08&r2=37c65c5b819bba634686bd1ddfbb4ce5d46f0fc6
http://git.horde.org/co.php/jonah/lib/View/ChannelEdit.php?rt=horde-git&r=37c65c5b819bba634686bd1ddfbb4ce5d46f0fc6
-----------------------------------------------------------------------
commit 80205df3710417a4bd88ea1d11d1e277b3ea313e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 16:32:27 2010 -0400
story lists and story views to Jonah_View
jonah/lib/View/StoryList.php | 116 +++++++++++++++++++++++
jonah/lib/View/StoryView.php | 105 ++++++++++++++++++++
jonah/stories/index.php | 90 ++----------------
jonah/stories/view.php | 81 ++--------------
jonah/templates/stories/layout/view.html.php | 19 ++---
jonah/templates/stories/partial/_story.html.php | 17 ++-
6 files changed, 255 insertions(+), 173 deletions(-)
create mode 100644 jonah/lib/View/StoryList.php
create mode 100644 jonah/lib/View/StoryView.php
http://git.horde.org/co.php/jonah/lib/View/StoryList.php?rt=horde-git&r=80205df3710417a4bd88ea1d11d1e277b3ea313e
http://git.horde.org/co.php/jonah/lib/View/StoryView.php?rt=horde-git&r=80205df3710417a4bd88ea1d11d1e277b3ea313e
http://git.horde.org/diff.php/jonah/stories/index.php?rt=horde-git&r1=d7095ab0cc85050f4185db0be1b5567fe933e8d0&r2=80205df3710417a4bd88ea1d11d1e277b3ea313e
http://git.horde.org/diff.php/jonah/stories/view.php?rt=horde-git&r1=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab&r2=80205df3710417a4bd88ea1d11d1e277b3ea313e
http://git.horde.org/diff.php/jonah/templates/stories/layout/view.html.php?rt=horde-git&r1=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab&r2=80205df3710417a4bd88ea1d11d1e277b3ea313e
http://git.horde.org/diff.php/jonah/templates/stories/partial/_story.html.php?rt=horde-git&r1=02a19dafff869dbc187a5c2dc3d8ad301aaf8fab&r2=80205df3710417a4bd88ea1d11d1e277b3ea313e
-----------------------------------------------------------------------
commit 691cf253cee9340e8646cf36195a3c866fbad2b6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 16:45:28 2010 -0400
move story editing to a view object.
This will probably get refactored again, to remove the Horde_Form usage to
give more control over the RTE, but for now, just leave it based on Horde_Form
jonah/lib/View/StoryEdit.php | 82 ++++++++++++++++++++++++++++++++++++++++++
jonah/stories/edit.php | 58 +++--------------------------
2 files changed, 88 insertions(+), 52 deletions(-)
create mode 100644 jonah/lib/View/StoryEdit.php
http://git.horde.org/co.php/jonah/lib/View/StoryEdit.php?rt=horde-git&r=691cf253cee9340e8646cf36195a3c866fbad2b6
http://git.horde.org/diff.php/jonah/stories/edit.php?rt=horde-git&r1=52f7f22598c20c104cc38368faa6987955a88146&r2=691cf253cee9340e8646cf36195a3c866fbad2b6
-----------------------------------------------------------------------
commit 4d0ba9c055dc45b8ad59c584a30a9b4f4ff256eb
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 16:59:02 2010 -0400
story deletion view
jonah/lib/View/StoryDelete.php | 88 ++++++++++++++++++++++++++++++++++++++++
jonah/lib/View/StoryEdit.php | 1 -
jonah/stories/delete.php | 74 ++-------------------------------
3 files changed, 93 insertions(+), 70 deletions(-)
create mode 100644 jonah/lib/View/StoryDelete.php
http://git.horde.org/co.php/jonah/lib/View/StoryDelete.php?rt=horde-git&r=4d0ba9c055dc45b8ad59c584a30a9b4f4ff256eb
http://git.horde.org/diff.php/jonah/lib/View/StoryEdit.php?rt=horde-git&r1=691cf253cee9340e8646cf36195a3c866fbad2b6&r2=4d0ba9c055dc45b8ad59c584a30a9b4f4ff256eb
http://git.horde.org/diff.php/jonah/stories/delete.php?rt=horde-git&r1=419ca9a3e914198d649c387330b87e5f86c50a08&r2=4d0ba9c055dc45b8ad59c584a30a9b4f4ff256eb
-----------------------------------------------------------------------
commit 6bd49d1c31bca54c9fbf9af8a3fe6912af4a3588
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri Jul 16 17:22:05 2010 -0400
pdf generation view
jonah/lib/View/Base.php | 10 +++++
jonah/lib/View/StoryPdf.php | 70 +++++++++++++++++++++++++++++++++++++++
jonah/stories/pdf.php | 77 ++++--------------------------------------
3 files changed, 88 insertions(+), 69 deletions(-)
create mode 100644 jonah/lib/View/StoryPdf.php
http://git.horde.org/diff.php/jonah/lib/View/Base.php?rt=horde-git&r1=c2fe084894ad8421a274ca0257da090b5146d047&r2=6bd49d1c31bca54c9fbf9af8a3fe6912af4a3588
http://git.horde.org/co.php/jonah/lib/View/StoryPdf.php?rt=horde-git&r=6bd49d1c31bca54c9fbf9af8a3fe6912af4a3588
http://git.horde.org/diff.php/jonah/stories/pdf.php?rt=horde-git&r1=419ca9a3e914198d649c387330b87e5f86c50a08&r2=6bd49d1c31bca54c9fbf9af8a3fe6912af4a3588
More information about the commits
mailing list