Implemented that inactive programs get gray text to make them more ea…

…sier distinguishable. This closes #779.
jens-maus · Feb 27, 2020 · 2a92422 · 2a92422 · drose28357 · Feb 28, 2020
1 parent 901c77d
commit 2a92422
Show file tree

Hide file tree

Showing 5 changed files with 19,040 additions and 0 deletions.
diff --git a/buildroot-external/patches/occu/0070-WebUI-ProgramList-InactiveProgramsMod.patch b/buildroot-external/patches/occu/0070-WebUI-ProgramList-InactiveProgramsMod.patch
@@ -0,0 +1,70 @@
+--- occu/WebUI/www/rega/pages/tabs/admin/views/programlist.htm.orig
++++ occu/WebUI/www/rega/pages/tabs/admin/views/programlist.htm
+@@ -122,20 +122,21 @@
+             {
+               string trId = "program"#o.ID();
+               WriteLine( '<tr id="'#trId#'" class="CLASS04901">' );
+-              WriteLine( '<td class="tBodyCell">'#o.Name()#'</td>' );
+-              WriteLine( '<td class="tBodyCell">'#o.PrgInfo()#'</td>' );
+-              WriteLine( '<td class="tBodyCell">' );
++              string sInactive = ""; if( !o.Active() ) { sInactive = "Inactive"; }
++              WriteLine( '<td class="tBodyCell'#sInactive#'">'#o.Name()#'</td>' );
++              WriteLine( '<td class="tBodyCell'#sInactive#'">'#o.PrgInfo()#'</td>' );
++              WriteLine( '<td class="tBodyCell'#sInactive#'">' );
+               object oPrgID = o.ID();
+               string sRet = "";
+               Call( "/esp/programs.fn::WriteConditionText()" );
+               Write (sRet);
+               WriteLine( '</td>' );
+-              WriteLine( '<td class="tBodyCell">' );
++              WriteLine( '<td class="tBodyCell'#sInactive#'">' );
+               string sRet = "";
+               Call( "/esp/programs.fn::WriteDestinationText()" );
+               Write(sRet);
+               WriteLine( '</td>' );
+-              WriteLine( '<td class="tBodyCell CLASS04902" >' );
++              WriteLine( '<td class="tBodyCell'#sInactive#' CLASS04902" >' );
+                 WriteLine( '<table cellpadding="0" cellspacing="0" border="0">' );
+                   WriteLine( '<tr>' );
+                     WriteLine( '<td>' );
+@@ -215,16 +216,17 @@
+               if( (o.IsTypeOf( OT_PROGRAM )) && (o.ProgramCopyID()==ID_ERROR) )
+               {
+                 string trId = "program"#o.ID();
++                string sInactive = ""; if( !o.Active() ) { sInactive = "Inactive"; }
+                 WriteLine( '<tr id="'#trId#'" class="CLASS04901">' );
+-                WriteLine( '<td class="tBodyCell">'#o.Name()#'</td>' );
+-                WriteLine( '<td class="tBodyCell">'#o.PrgInfo()#'</td>' );
+-                WriteLine( '<td class="tBodyCell">' );
++                WriteLine( '<td class="tBodyCell'#sInactive#'">'#o.Name()#'</td>' );
++                WriteLine( '<td class="tBodyCell'#sInactive#'">'#o.PrgInfo()#'</td>' );
++                WriteLine( '<td class="tBodyCell'#sInactive#'">' );
+                 object oPrgID = o.ID();
+                 string sRet = "";
+                 Call( "/esp/programs.fn::WriteConditionText()" );
+                 Write (sRet);
+                 WriteLine( '</td>' );
+-                WriteLine( '<td class="tBodyCell">' );
++                WriteLine( '<td class="tBodyCell'#sInactive#'">' );
+                 string sRet = "";
+                 Call( "/esp/programs.fn::WriteDestinationText()" );
+                 Write(sRet);
+--- occu/WebUI/www/webui/style.css.orig
++++ occu/WebUI/www/webui/style.css
+@@ -1201,6 +1201,16 @@
+   text-align: left;
+ }
+
++.tBodyCellInactive
++{
++  background-color: $_(activeBackground); /* #f0f0f0 */
++  height: 40px;
++  border: solid 1px $_(black); /* black */
++  color: $_(inactiveBackground); /* #bcc7cb */
++  padding: 4px;
++  text-align: left;
++}
++
+ .tBodyCellCenter
+ {
+   background-color: $_(activeBackground); /* #f0f0f0 */