Merge pull request #1891 from livecode/bugfix-20901

[[ Bug 20901 ]] Fix issues with users' extension guides

Author: livecodepanos

Documentation/html_viewer/js/guide_functions.js

@@ -67,10 +67,17 @@
 			{
 				return '<img src="' + tRepoFolder + '/images/' + image_file + '" />';
 			}
-			else
+			else if (tGuideLocation == 'ide')
 			{
 				return '<img src="' + tIDEFolder + '/images/' + image_file + '" />';
 			}
+			else
+			{
+				var tExtImageFolder = '<img src="';
+				tExtImageFolder += tUserGuideData.guides[pGuideIndex].location;
+				tExtImageFolder += '/images/' + image_file + '" />';
+				return tExtImageFolder;
+			}
 		},
 
 		renderer.link = function(href, title, text)

Toolset/libraries/revidelibrary.8.livecodescript

@@ -11029,11 +11029,12 @@ private function revIDEGetDocsGuideData
       put empty into tExtensionGuide
       put tExtensionData["folder"] into tFolder
       put revEnvironmentUserDocsPath() & slash & \ 
-            the last item of tFolder into tCachedDataFolder
+            tExtensionData["name"] into tCachedDataFolder
       put tFolder & slash & "guide.md" into tGuideFile
       if there is not a file tGuideFile then
          -- User widgets have the guide.md in docs/guide/
-         put tFolder & slash & "docs/guide/guide.md" into tGuideFile
+         put "/docs/guide" after tFolder
+         put tFolder & slash & "guide.md" into tGuideFile
       end if
       if there is not a file tGuideFile then next repeat
       revIDEEnsurePath tCachedDataFolder
@@ -11052,8 +11053,10 @@ private function revIDEGetDocsGuideData
 
          if tGuide is not empty then
             put "{" & CR after tExtensionGuide
-            put tab & quote & "name" & quote & ":" && quote & tFolder & quote & comma & CR after tExtensionGuide
-            put tab & quote & "display name" & quote & ":" && quote & tFolder & quote & comma & CR after tExtensionGuide
+            put tab & quote & "name" & quote & ":" && quote & tExtensionData["name"] & quote & comma & CR after tExtensionGuide
+            put tab & quote & "display name" & quote & ":" && quote & tExtensionData["title"] & quote & comma & CR after tExtensionGuide
+            put tab & quote & "group" & quote & ":" && quote & "Extensions" & quote & comma & CR after tExtensionGuide
+            put tab & quote & "location" & quote & ":" && quote & tFolder & quote & comma & CR after tExtensionGuide
             put quote & "data" & quote & ":" & escape(tGuide, true) & CR after tExtensionGuide
             put "}" after tExtensionGuide
 

notes/bugfix-20901.md

@@ -0,0 +1 @@
+# Fix issues with users' extension guides