[vlma-devel] commit: Put satellites management and satellite channels management together. ( Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Thu May 29 02:07:04 2008 +0200| [8fe06b158e558a394d22b4b871e124a7031023c4]

Put satellites management and satellite channels management together.

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

 vlma-webapp/src/main/resources/messages.properties |    3 +-
 .../src/main/resources/messages_fr.properties      |    3 +-
 .../src/main/webapp/WEB-INF/defs/templates.xml     |   64 ++++++++-----------
 .../WEB-INF/jsp/configuration/quicklinks.jsp       |    3 +-
 .../main/webapp/WEB-INF/jsp/file/quicklinks.jsp    |    3 +-
 .../main/webapp/WEB-INF/jsp/media/quicklinks.jsp   |    3 +-
 .../main/webapp/WEB-INF/jsp/order/quicklinks.jsp   |    3 +-
 .../src/main/webapp/WEB-INF/jsp/sat/quicklinks.jsp |   12 ----
 .../src/main/webapp/WEB-INF/jsp/sat/sat_left.jsp   |    8 ---
 .../webapp/WEB-INF/jsp/satellite/quicklinks.jsp    |    3 +-
 .../jsp/{sat => satellite}/satchannellist_left.jsp |    2 +-
 .../{sat => satellite}/satchannellist_right.jsp    |    0 
 .../{sat => satellite}/satchannelupdate_right.jsp  |    0 
 .../satchannelupdatesuccess_right.jsp              |    0 
 .../WEB-INF/jsp/satellite/satellite_left.jsp       |    2 +
 .../WEB-INF/jsp/satellite/satelliteedit_right.jsp  |    4 +-
 .../main/webapp/WEB-INF/jsp/server/quicklinks.jsp  |    3 +-
 .../main/webapp/WEB-INF/jsp/stream/quicklinks.jsp  |    3 +-
 .../src/main/webapp/WEB-INF/jsp/tnt/quicklinks.jsp |    3 +-
 .../main/webapp/WEB-INF/jsp/welcome/quicklinks.jsp |    3 +-
 20 files changed, 43 insertions(+), 82 deletions(-)

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