Merge pull request #10 from Amstutz/trunk_gui_glyph_pr

Trunk gui glyph pr
ILIAS-eLearning · Jul 13, 2016 · 136d0f9 · 136d0f9
2 parents 6287249 + af1a868
commit 136d0f9
Show file tree

Hide file tree

Showing 33 changed files with 788 additions and 464 deletions.
diff --git a/Services/UICore/classes/class.ilTemplate.php b/Services/UICore/classes/class.ilTemplate.php
@@ -1520,6 +1520,15 @@ function getTemplatePath($a_tplname, $a_in_module = false, $a_plugin = false)
 			{
 				$fname = "./".$module_path."templates/default/".basename($a_tplname);
 			}
+		}else if(strpos($a_tplname,"src/UI")===0){
+			if (ilStyleDefinition::getCurrentSkin() != "default")
+			{
+				$fname = "./Customizing/global/skin/".ilStyleDefinition::getCurrentSkin()."/".str_replace("src/UI/templates/default","UI",$a_tplname);
+			}
+			if($fname == "" || !file_exists($fname))
+			{
+				$fname = $a_tplname;
+			}
 		}
 		else
 		{

diff --git a/src/UI/Component/Counter/Factory.php b/src/UI/Component/Counter/Factory.php
@@ -16,7 +16,11 @@ interface Factory {
 	 *       number of comments.
 	 *   composition: >
 	 *       The Status Counter is a non-obstrusive Counter.
+	 *   effect: >
+	 *       Status Counters convey information, they are not interactive.
 	 *
+	 * context:
+	 *   - The Status Counter is used in the ‘Who is online?’ Tool.
 	 * rules:
 	 *   style:
 	 *       1: >
@@ -37,8 +41,8 @@ public function status($number);
 	 * title: Novelty
 	 * description:
 	 *   purpose: >
-	 *       Novelty Counters inform users about the arrival or creation of new
-	 *       items of the kind indicated.
+	 *       Novelty counters inform users about the arrival or creation of new items of the kind indicated
+	 *       by the accompanying glyph.
 	 *   composition: >
 	 *       A Novelty Counter is an obtrusive counter.
 	 *   effect: >