[cvs] commit: framework/Block/Block Layout.php framework/Block/Block/Layout Manager.php View.php horde/services/portal edit.php index.php horde/templates/portal edit.inc empty.inc footer.inc header.inc layout.inc horde/themes screen.css

[Chuck Hagenbuch]

chuck       2006-01-28 08:16:11 PST

  Modified files:        (Branch: FRAMEWORK_3)
    services/portal      edit.php index.php 
    templates/portal     edit.inc layout.inc 
    themes               screen.css 
  Added files:           (Branch: FRAMEWORK_3)
    Block/Block/Layout   Manager.php View.php 
  Removed files:         (Branch: FRAMEWORK_3)
    Block/Block          Layout.php 
    templates/portal     empty.inc footer.inc header.inc 
  Log:
  Merge Portal/block changes.
  
  Revision    Changes    Path
  1.21.10.10  +0 -1260   framework/Block/Block/Attic/Layout.php (dead)
  1.4.2.1     +1396 -0   framework/Block/Block/Layout/Manager.php (new)
  1.4.2.1     +142 -0    framework/Block/Block/Layout/View.php (new)
  1.44.8.4    +8 -101    horde/services/portal/edit.php
  1.39.10.6   +9 -59     horde/services/portal/index.php
  1.2.10.1    +0 -1      horde/templates/portal/Attic/empty.inc (dead)
  1.1.12.1    +0 -1      horde/templates/portal/Attic/footer.inc (dead)
  1.2.10.1    +0 -1      horde/templates/portal/Attic/header.inc (dead)
  1.7.4.3     +15 -10    horde/templates/portal/edit.inc
  1.18.10.4   +2 -2      horde/templates/portal/layout.inc
  1.7.4.52    +6 -1      horde/themes/screen.css

  Chora Links:
  http://cvs.horde.org/co.php/framework/Block/Block/Attic/Layout.php?r=1.21.10.9
  http://cvs.horde.org/co.php/framework/Block/Block/Layout/Manager.php?r=1.4.2.1
  http://cvs.horde.org/co.php/framework/Block/Block/Layout/View.php?r=1.4.2.1
  http://cvs.horde.org/diff.php/horde/services/portal/edit.php?r1=1.44.8.3&r2=1.44.8.4&ty=u
  http://cvs.horde.org/diff.php/horde/services/portal/index.php?r1=1.39.10.5&r2=1.39.10.6&ty=u
  http://cvs.horde.org/co.php/horde/templates/portal/Attic/empty.inc?r=1.2
  http://cvs.horde.org/co.php/horde/templates/portal/Attic/footer.inc?r=1.1
  http://cvs.horde.org/co.php/horde/templates/portal/Attic/header.inc?r=1.2
  http://cvs.horde.org/diff.php/horde/templates/portal/edit.inc?r1=1.7.4.2&r2=1.7.4.3&ty=u
  http://cvs.horde.org/diff.php/horde/templates/portal/layout.inc?r1=1.18.10.3&r2=1.18.10.4&ty=u
  http://cvs.horde.org/diff.php/horde/themes/screen.css?r1=1.7.4.51&r2=1.7.4.52&ty=u