47308: Failed test: Einzelne Wiki-Abgaben drucken

Author: alex40724

components/ILIAS/COPage/COPage.php

@@ -110,6 +110,18 @@ public function getTarget(): string
                 return "assets/js/ilIntLink.js";
             }
         };
+        // this is just a dummy to make the html export to the same
+        // target assets/content_style/style.css work
+        $contribute[Component\Resource\PublicAsset::class] = static fn() => new class () implements Component\Resource\PublicAsset {
+            public function getSource(): string
+            {
+                return "components/ILIAS/COPage/css/content_base.css";
+            }
+            public function getTarget(): string
+            {
+                return "assets/content_style/style.css";
+            }
+        };
 
     }
 }

components/ILIAS/COPage/classes/class.ilCOPageHTMLExport.php

@@ -140,7 +140,7 @@ public function exportStyles(): void
             } else {
                 $this->export_collector->addDirectory(
                     ilObjStyleSheet::getBasicImageDir(),
-                    "/basic_style/images"
+                    "/assets/basic_style/images"
                 );
                 $this->export_collector->addFile(
                     "../components/ILIAS/COPage/css/content.css",
@@ -161,7 +161,7 @@ public function exportStyles(): void
                     $this->export_collector->addContainerDirectory(
                         $res_id->serialize(),
                         "",
-                        "content_style"
+                        "assets/content_style"
                     );
                 }
             }
@@ -493,8 +493,12 @@ protected function initResourceTemplate(
         $this->global_screen->layout()->meta()->reset();
         $tpl = new ilGlobalTemplate($template_file, true, true, "components/ILIAS/COPage");
         $this->getPreparedMainTemplate($tpl);
-        $tpl->addCss(\ilUtil::getStyleSheetLocation());
-        $tpl->addCss(ilObjStyleSheet::getContentStylePath($this->getContentStyleId()));
+        $this->global_screen->layout()->meta()->addCss(
+            \ilUtil::getStyleSheetLocation()
+        );
+        $this->global_screen->layout()->meta()->addCss(
+            \ilObjStyleSheet::getExportContentStylePath()
+        );
         $tpl->addCss(ilObjStyleSheet::getSyntaxStylePath());
         return $tpl;
     }

components/ILIAS/Export/HTML/class.Util.php

@@ -152,6 +152,10 @@ public function exportResourceFiles(): void
         $target_dir = $this->target_dir;
         $css = $global_screen->layout()->meta()->getCss();
         foreach ($css->getItemsInOrderOfDelivery() as $item) {
+            // skip dummy "assets/content_style/style.css"
+            if (str_contains($item->getContent(), "assets/content_style")) {
+                continue;
+            }
             $this->exportResourceFile($target_dir, $item->getContent());
         }
         $js = $global_screen->layout()->meta()->getJs();

components/ILIAS/Export/Print/class.PrintProcessGUI.php

@@ -157,12 +157,7 @@ public function renderPrintView(int $content_style_id = 0): string
 
         $tpl->setBodyClass($this->body_class);
         $tpl->addCss(\ilUtil::getStyleSheetLocation("filesystem"));
-        $tpl->addCss(
-            \ilObjStyleSheet::getContentStylePath(
-                $content_style_id,
-                false
-            )
-        );
+        $tpl->addCss(\ilObjStyleSheet::getExportContentStylePath());
         $tpl->addCss(\ilObjStyleSheet::getContentPrintStyle());
         $tpl->addCss(\ilObjStyleSheet::getSyntaxStylePath());
 

components/ILIAS/LearningModule/Presentation/class.ilLMPresentationGUI.php

@@ -1079,10 +1079,16 @@ public function getCurrentPageId(): ?int
     protected function setContentStyles(): void
     {
         // content style
-        $this->content_style_gui->addCss(
-            $this->tpl,
-            $this->lm->getRefId()
-        );
+        if ($this->offlineMode()) {
+            $this->content_style_gui->addExportCss(
+                $this->tpl
+            );
+        } else {
+            $this->content_style_gui->addCss(
+                $this->tpl,
+                $this->lm->getRefId()
+            );
+        }
         $this->tpl->addCss(ilObjStyleSheet::getSyntaxStylePath());
     }
 

components/ILIAS/Portfolio/Page/class.ilPortfolioPageGUI.php

@@ -81,14 +81,6 @@ public function __construct(
             ilObjStyleSheet::getSyntaxStylePath()
         );
         $tpl->parseCurrentBlock();
-
-        $tpl->setCurrentBlock("ContentStyle");
-        $tpl->setVariable(
-            "LOCATION_CONTENT_STYLESHEET",
-            ilObjStyleSheet::getContentStylePath(0)
-        );
-        $tpl->parseCurrentBlock();
-
         $this->requested_ppage = $this->port_request->getPortfolioPageId();
     }
 

components/ILIAS/Style/Content/Service/class.GUIService.php

@@ -79,4 +79,9 @@ public function addCss(ilGlobalTemplateInterface $tpl, int $ref_id, int $obj_id
         $eff_style_id = $this->internal->domain()->object($ref_id, $obj_id)->getEffectiveStyleId();
         $tpl->addCss(ilObjStyleSheet::getContentStylePath($eff_style_id));
     }
+
+    public function addExportCss(ilGlobalTemplateInterface $tpl): void
+    {
+        $tpl->addCss(ilObjStyleSheet::getExportContentStylePath());
+    }
 }

components/ILIAS/Style/Content/classes/class.ilObjStyleSheet.php

@@ -1566,7 +1566,7 @@ public function getParametersOfClass(
 
     public static function getExportContentStylePath(): string
     {
-        return "content_style/style.css";
+        return "assets/content_style/style.css";
     }
 
     /**

components/ILIAS/Style/Content/classes/class.ilObjStyleSheetGUI.php

@@ -495,18 +495,16 @@ public function saveObject(): void
 
         // assign style to style sheet folder,
         // if parent is style sheet folder
-        if ($this->requested_ref_id > 0) {
-            $fold = ilObjectFactory::getInstanceByRefId($this->requested_ref_id);
-            if ($fold->getType() == "stys") {
-                $cont_style_settings = new ilContentStyleSettings();
-                $cont_style_settings->addStyle($newObj->getId());
-                $cont_style_settings->update();
-
-                ilObjStyleSheet::_writeStandard($newObj->getId(), true);
-                $this->tpl->setOnScreenMessage("success", $this->lng->txt("object_added"), true);
-                $this->ctrl->setParameterByClass(self::class, "obj_id", (string) $newObj->getId());
-                $this->ctrl->redirectByClass(self::class, "");
-            }
+        if ($this->requested_ref_id > 0 &&
+            ilObject::_lookupType($this->requested_ref_id, true) === "stys") {
+            $cont_style_settings = new ilContentStyleSettings();
+            $cont_style_settings->addStyle($newObj->getId());
+            $cont_style_settings->update();
+
+            ilObjStyleSheet::_writeStandard($newObj->getId(), true);
+            $this->tpl->setOnScreenMessage("success", $this->lng->txt("object_added"), true);
+            $this->ctrl->setParameterByClass(self::class, "obj_id", (string) $newObj->getId());
+            $this->ctrl->redirectByClass(self::class, "");
         }
     }