Links directly to controls on screen page from control overview

Author: modery

PowerDocu.AppDocumenter/AppHtmlBuilder.cs

@@ -386,9 +386,10 @@ private string CreateControlListHtml(ControlEntity control)
                 bitmap?.Save(content.folderPath + @"resources\" + control.Type + ".png");
             }
             string screenFile = screenFileNames.GetValueOrDefault(control.Screen()?.Name, "#");
+            string controlAnchor = SanitizeAnchorId(control.Name);
             StringBuilder sb = new StringBuilder("<ul>");
             sb.Append("<li>");
-            sb.Append($"<a href=\"{Encode(screenFile)}\">");
+            sb.Append($"<a href=\"{Encode(screenFile)}#{controlAnchor}\">");
             sb.Append(ImageWithClass(control.Type, "resources/" + control.Type + ".png", "icon-inline"));
             sb.Append($" {Encode(control.Name)}</a>");
             foreach (ControlEntity child in control.Children.OrderBy(o => o.Name).ToList())

PowerDocu.AppDocumenter/AppMarkdownBuilder.cs

@@ -286,13 +286,14 @@ private MdBulletList CreateControlList(ControlEntity control)
             {
                 bitmap?.Save(content.folderPath + @"resources\" + control.Type + ".png");
             }
-            //link to the screen instead of the control directly for the moment, as the directly generated anchor link (#" + control.Name.ToLower()) doesn't work the same way in DevOps and GitHub
+            string screenFileName = ("screen " + control.Screen().Name + " " + content.filename + ".md").Replace(" ", "-");
+            string controlAnchor = control.Name.ToLowerInvariant().Replace(" ", "-");
             MdBulletList list = new MdBulletList(){
                                      new MdListItem(new MdLinkSpan(
                                             new MdCompositeSpan(
                                                 new MdImageSpan(control.Type, "resources/"+control.Type+".png"),
                                                 new MdTextSpan(" "+control.Name))
-                                        ,("screen " + control.Screen().Name + " " + content.filename + ".md").Replace(" ", "-")))};
+                                        , screenFileName + "#" + controlAnchor))};
 
             foreach (ControlEntity child in control.Children.OrderBy(o => o.Name).ToList())
             {
@@ -385,7 +386,7 @@ private void addAppControlsTable(ControlEntity control, MdDocument screenDoc)
                         }
                         else
                         {
-                            tableRows.Add(new MdTableRow(rule.Property, getCodeBlock(rule.InvariantScript)));
+                            tableRows.Add(new MdTableRow(rule.Property, new MdRawMarkdownSpan(getCodeBlock(rule.InvariantScript))));
                         }
                     }
                 }
@@ -459,7 +460,7 @@ private MdTableRow CreateRowForControlProperty(Rule rule, string defaultValue)
                      .Append("<td style=\"background-color:#ffcccc; width:50%;\">").Append(defaultValue).Append("</td></tr></table>");
                 return new MdTableRow(rule.Property, new MdRawMarkdownSpan(table.ToString()));
             }
-            return new MdTableRow(rule.Property, getCodeBlock(rule.InvariantScript));
+            return new MdTableRow(rule.Property, new MdRawMarkdownSpan(getCodeBlock(rule.InvariantScript)));
         }
 
         private void addAppDataSources()