config: cosmetic updates for image cache/satips

tvheadend · Sep 14, 2015 · e537902 · e537902
1 parent e8ca1e6
commit e537902
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/src/satip/server.c b/src/satip/server.c
@@ -559,79 +559,102 @@ const idclass_t satip_server_class = {
   .ic_event      = "satip_server",
   .ic_perm_def   = ACCESS_ADMIN,
   .ic_save       = satip_server_class_save,
+  .ic_groups     = (const property_group_t[]) {
+      {
+         .name   = N_("General"),
+         .number = 1,
+      },
+      {
+         .name   = N_("Exported Tuners"),
+         .number = 2,
+      },
+      {}
+  },
   .ic_properties = (const property_t[]){
     {
       .type   = PT_INT,
       .id     = "satip_rtsp",
       .name   = N_("RTSP Port (554 or 9983), 0 = disable"),
       .off    = offsetof(struct satip_server_conf, satip_rtsp),
+      .group  = 1,
     },
     {
       .type   = PT_INT,
       .id     = "satip_weight",
       .name   = N_("Subscription Weight"),
       .off    = offsetof(struct satip_server_conf, satip_weight),
+      .group  = 1,
     },
     {
       .type   = PT_INT,
       .id     = "satip_descramble",
       .name   = N_("Descramble Services (Limit Per Mux)"),
       .off    = offsetof(struct satip_server_conf, satip_descramble),
+      .group  = 1,
     },
     {
       .type   = PT_INT,
       .id     = "satip_muxcnf",
       .name   = N_("Mux Handling"),
       .off    = offsetof(struct satip_server_conf, satip_muxcnf),
       .list   = satip_server_class_muxcfg_list,
+      .group  = 1,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbs",
-      .name   = N_("Exported DVB-S Tuners"),
+      .name   = N_("DVB-S"),
       .off    = offsetof(struct satip_server_conf, satip_dvbs),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbs2",
-      .name   = N_("Exported DVB-S2 Tuners"),
+      .name   = N_("DVB-S2"),
       .off    = offsetof(struct satip_server_conf, satip_dvbs2),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbt",
-      .name   = N_("Exported DVB-T Tuners"),
+      .name   = N_("DVB-T"),
       .off    = offsetof(struct satip_server_conf, satip_dvbt),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbt2",
-      .name   = N_("Exported DVB-T2 Tuners"),
+      .name   = N_("DVB-T2"),
       .off    = offsetof(struct satip_server_conf, satip_dvbt2),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbc",
-      .name   = N_("Exported DVB-C Tuners"),
+      .name   = N_("DVB-C"),
       .off    = offsetof(struct satip_server_conf, satip_dvbc),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbc2",
-      .name   = N_("Exported DVB-C2 Tuners"),
+      .name   = N_("DVB-C2"),
       .off    = offsetof(struct satip_server_conf, satip_dvbc2),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_atsc",
-      .name   = N_("Exported ATSC Tuners"),
+      .name   = N_("ATSC"),
       .off    = offsetof(struct satip_server_conf, satip_atsc),
+      .group  = 2,
     },
     {
       .type   = PT_INT,
       .id     = "satip_dvbc2",
-      .name   = N_("Exported DVB-Cable/AnnexB Tuners"),
+      .name   = N_("DVB-Cable/AnnexB"),
       .off    = offsetof(struct satip_server_conf, satip_dvbcb),
+      .group  = 2,
     },
     {}
   },

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
@@ -580,7 +580,6 @@ extjs_start(void)
   http_path_add("/tv.html",          NULL, extjs_livetv,           ACCESS_WEB_INTERFACE);
   http_path_add("/capabilities",     NULL, extjs_capabilities,     ACCESS_WEB_INTERFACE);
   http_path_add("/epggrab",          NULL, extjs_epggrab,          ACCESS_WEB_INTERFACE);
-  http_path_add("/config",           NULL, extjs_config,           ACCESS_WEB_INTERFACE);
 #if ENABLE_TIMESHIFT
   http_path_add("/timeshift",        NULL, extjs_timeshift,        ACCESS_ADMIN);
 #endif

diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js
@@ -119,6 +119,8 @@ tvheadend.imgcacheconf = function(panel, index) {
         iconCls: 'imgcacheconf',
         tabIndex: index,
         comet: 'imagecache',
+        width: 550,
+        labelWidth: 200,
         tbar: [cleanButton, triggerButton],
         help: function() {
             new tvheadend.help(_('General Configuration'), 'config_general.html');
@@ -159,6 +161,8 @@ tvheadend.satipsrvconf = function(panel, index) {
         iconCls: 'satipsrvconf',
         tabIndex: index,
         comet: 'satip_server',
+        width: 600,
+        labelWidth: 250,
         tbar: [discoverButton],
         help: function() {
             new tvheadend.help(_('SAT>IP Server Configuration'), 'config_satips.html');