[vlma-devel] commit: Divide section "Media" into "Satellite channels" and "TNT channels" . (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Thu May 29 01:34:37 2008 +0200| [5e25db86deba72872ee42f3530a0f6a4dd0660af]

Divide section "Media" into "Satellite channels" and "TNT channels".

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=5e25db86deba72872ee42f3530a0f6a4dd0660af
---

 ...{MediasProgramAdd.java => MediaProgramAdd.java} |    2 +-
 ...troller.java => MediaProgramAddController.java} |   45 +++--
 ...alidator.java => MediaProgramAddValidator.java} |    6 +-
 ...ller.java => MediaProgramRemoveController.java} |   45 +++--
 ...dator.java => MediaProgramRemoveValidator.java} |    6 +-
 .../vlma/web/{ => media}/file/FileChannelAdd.java  |    2 +-
 .../{ => media}/file/FileChannelAddController.java |    2 +-
 .../{ => media}/file/FileChannelAddValidator.java  |    2 +-
 .../file/FileChannelEditController.java            |    2 +-
 .../{ => media}/file/FileChannelEditValidator.java |    2 +-
 .../file/FileChannelListController.java            |    2 +-
 .../vlma/web/{ => media}/file/package.html         |    0 
 .../java/org/videolan/vlma/web/media/package.html  |    2 +-
 .../SatChannelListController.java}                 |   14 +--
 .../SatChannelUpdate.java}                         |    4 +-
 .../SatChannelUpdateController.java}               |    8 +-
 .../SatChannelUpdateSuccessController.java}        |    4 +-
 .../SatChannelUpdateValidator.java}                |    8 +-
 .../videolan/vlma/web/media/satellite/package.html |    6 +
 .../web/{ => media}/stream/StreamChannelAdd.java   |    2 +-
 .../stream/StreamChannelAddController.java         |    2 +-
 .../stream/StreamChannelAddValidator.java          |    2 +-
 .../stream/StreamChannelEditController.java        |    2 +-
 .../stream/StreamChannelEditValidator.java         |    2 +-
 .../stream/StreamChannelListController.java        |    2 +-
 .../vlma/web/{ => media}/stream/package.html       |    0 
 .../vlma/web/media/{ => tnt}/TNTChannelAdd.java    |    2 +-
 .../media/{ => tnt}/TNTChannelAddController.java   |    2 +-
 .../media/{ => tnt}/TNTChannelAddValidator.java    |    2 +-
 .../TNTChannelListController.java}                 |   18 +--
 .../{ => tnt}/TNTChannelRemoveController.java      |   49 +-----
 .../media/{ => tnt}/TNTChannelRemoveValidator.java |    2 +-
 .../org/videolan/vlma/web/media/tnt/package.html   |    6 +
 vlma-webapp/src/main/resources/messages.properties |    6 +-
 .../src/main/resources/messages_fr.properties      |    6 +-
 .../src/main/webapp/WEB-INF/VLMa-servlet.xml       |  130 +++++++------
 .../src/main/webapp/WEB-INF/defs/templates.xml     |   74 +++++---
 .../WEB-INF/jsp/configuration/quicklinks.jsp       |    3 +-
 .../WEB-INF/jsp/file/filechannellist_right.jsp     |    4 +-
 .../main/webapp/WEB-INF/jsp/file/quicklinks.jsp    |    3 +-
 .../main/webapp/WEB-INF/jsp/media/media_left.jsp   |    7 +
 .../mediaprogramadd_right.jsp}                     |    6 +-
 .../mediaprogramremove_right.jsp}                  |    2 +-
 .../WEB-INF/jsp/{medias => media}/quicklinks.jsp   |    3 +-
 .../webapp/WEB-INF/jsp/medias/mediaslist_right.jsp |  189 --------------------
 .../main/webapp/WEB-INF/jsp/order/quicklinks.jsp   |    3 +-
 .../WEB-INF/jsp/{medias => sat}/quicklinks.jsp     |    3 +-
 .../src/main/webapp/WEB-INF/jsp/sat/sat_left.jsp   |    8 +
 .../satchannellist_left.jsp}                       |    2 +-
 .../WEB-INF/jsp/sat/satchannellist_right.jsp       |   94 ++++++++++
 .../satchannelupdate_right.jsp}                    |    4 +-
 .../satchannelupdatesuccess_right.jsp}             |    0 
 .../webapp/WEB-INF/jsp/satellite/quicklinks.jsp    |    3 +-
 .../main/webapp/WEB-INF/jsp/server/quicklinks.jsp  |    3 +-
 .../main/webapp/WEB-INF/jsp/server/server_left.jsp |    2 +-
 .../main/webapp/WEB-INF/jsp/stream/quicklinks.jsp  |    3 +-
 .../WEB-INF/jsp/stream/streamchanneladd_right.jsp  |    6 +-
 .../WEB-INF/jsp/stream/streamchannellist_right.jsp |    4 +-
 .../WEB-INF/jsp/{medias => tnt}/quicklinks.jsp     |    3 +-
 .../{medias/medias_left.jsp => tnt/tnt_left.jsp}   |    3 +-
 .../jsp/{medias => tnt}/tntchanneladd_right.jsp    |    0 
 .../WEB-INF/jsp/tnt/tntchannellist_right.jsp       |   93 ++++++++++
 .../jsp/{medias => tnt}/tntchannelremove_right.jsp |    0 
 .../main/webapp/WEB-INF/jsp/welcome/quicklinks.jsp |    3 +-
 64 files changed, 478 insertions(+), 447 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlma.git/?a=commitdiff;h=5e25db86deba72872ee42f3530a0f6a4dd0660af