Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -rb6a4af341329e049f1e643fc19e74b69f5712acf -rf918fdc6084f1815d7d4b58172158767fba9a214 --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision b6a4af341329e049f1e643fc19e74b69f5712acf) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision f918fdc6084f1815d7d4b58172158767fba9a214) @@ -1,4 +1,6 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration"%> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> @@ -276,36 +278,40 @@ - -
- - + +
+ + +
- -
- - -
+
+ + + +
+ + +
@@ -386,6 +394,7 @@
+
+
@@ -475,7 +485,7 @@ Index: lams_central/web/css/authoring.css =================================================================== diff -u -r2d50303390a6ea1ec157a3a1390ecf3833c0339c -rf918fdc6084f1815d7d4b58172158767fba9a214 --- lams_central/web/css/authoring.css (.../authoring.css) (revision 2d50303390a6ea1ec157a3a1390ecf3833c0339c) +++ lams_central/web/css/authoring.css (.../authoring.css) (revision f918fdc6084f1815d7d4b58172158767fba9a214) @@ -225,7 +225,8 @@ div#ldStoreDialogContents #ldStoreDialogNameContainer input { width: 300px; - margin-left: 10px; + margin-left: 10px; + color: #000000; } div.branchMappingDialog .container-fluid { @@ -332,7 +333,7 @@ } td#templateContainerCell { - width: 150px; + width: 175px; vertical-align: top; } @@ -344,26 +345,32 @@ div.templateContainer { display: none; overflow: auto; - border: black thin solid; - background-color: rgb(219, 230, 252); + border: 0.5px solid #a9a9a9; + border-radius: 3px; + // background-color: rgb(219, 230, 252); } div.template { - height: 40px; - border-bottom: black thin solid; + height: 45px; + border-bottom: 0.5px solid #a9a9a9; cursor: pointer; } +.tooltemplate { +} + +.tooltemplate :hover { + background-color: #EDEDED; +} + div.template img { - margin: 5px 0 5px 5px; + margin: 8px 0 5px 5px; } div.template div { float: right; - width: 89px; - padding-top: 14px; - font-size: 12px; - font-family: "Lucida Console", Monaco, monospace; + width: 130px; + padding-top: 12px; } td#canvasContainerCell { @@ -372,13 +379,14 @@ #ldDescriptionDiv { z-index: 1099; - border-bottom: 1px solid black; + border-bottom: 1px solid #000000; } #ldDescriptionDiv #ldDescriptionTitleContainer { padding: 2px 0 0 0; text-align: center; - font-size: 12px; + font-size: 14px; + font-weight: bold; cursor: pointer; } @@ -422,4 +430,4 @@ #canvas { overflow: auto; vertical-align: top; -} \ No newline at end of file +} Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -rcaf0b925fc9dc4ec29fa3c462afceac023b0b552 -rf918fdc6084f1815d7d4b58172158767fba9a214 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision caf0b925fc9dc4ec29fa3c462afceac023b0b552) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision f918fdc6084f1815d7d4b58172158767fba9a214) @@ -176,8 +176,8 @@ // if a tool's name is too long and gets broken into two lines // make some adjustments to layout var toolName = $('div', this); - if (toolName.text().length > 12){ - toolName.css('padding-top', '5px'); + if (toolName.text().length > 17){ + toolName.css('padding-top', '2px'); } } }); @@ -2749,4 +2749,4 @@ }); } } -}; \ No newline at end of file +};
-
+
-
- + + - - - -