diff --git a/src/assets/conf/resources-landing-page.json b/src/assets/conf/resources-landing-page.json index 5d6af89..71f1a5a 100644 --- a/src/assets/conf/resources-landing-page.json +++ b/src/assets/conf/resources-landing-page.json @@ -1,10 +1,9 @@ { "grid-container": { - -"Human-Resources": { + "Human Resources": { "description": "Policies, recruitment, onboarding, benefits and compensation", "cards": [ { @@ -68,7 +67,7 @@ "description": "Provide this form to HR if you would like to defer or change part of your compensation to the company’s SIMPLE IRA Plan.", "imagePath": "pdf-icon3-100x100.png", "urlText": "../resources/Notice and Agreement.pdf", - "altText": "PDF icon" + "altText": "PDF icon" } ] }, @@ -124,18 +123,18 @@ "description": "Through Facebook, the company connects with the community by sharing content and interacting with the public.", "imagePath": "facebooklogo_100x100.png", "urlText": "https://www.facebook.com/JDSfaulkner/", - "altText": "Facebook icon" + "altText": "Facebook icon" }, { "title": "LinkedIn", "description": "JDSfaulkner maintains a presence on LinkedIn for professional networking, posting job openings and receiving resumes.", "imagePath": "linkedinlogo_100x100.png", "urlText": "https://www.linkedin.com/company/jds-consulting-&-design", - "altText": "LinkedIn icon" - }, + "altText": "LinkedIn icon" + } ] }, - + "Productivity": { "description": "Work tools, e-mail, calendar and cloud storage", @@ -195,27 +194,26 @@ "imagePath": "learning-center-icon4-100x100.png", "urlText": "https://learning.carolina.engineering/additional-resources/", "altText": "Learning Center icon" - } + }, { "title": "Field Guide", "description": "This quick-reference guide helps engineering technicians find charts, tables, and third-party information, at-a-glance.", "imagePath": "learning-center-icon4-100x100.png", "urlText": "https://learning.carolina.engineering/additional-resources/", "altText": "Learning Center icon" - } + }, { "title": "CAD Tech Study Guide", "description": "This guide presents lessons for drafters, each of which can help a drafter advance to CAD Tech II status.", "imagePath": "learning-center-icon4-100x100.png", "urlText": "https://learning.carolina.engineering/additional-resources/", "altText": "Learning Center icon" - } + } ] }, - - "Workflow": { + "Workflow": { "description": "Project management, assignments, status, client information, invoicing, data and engineering reports", "cards": [ { @@ -255,6 +253,5 @@ } ] } - } } \ No newline at end of file diff --git a/src/assets/pages/styles/theme-base.scss b/src/assets/pages/styles/theme-base.scss index a18ea84..c7fc2ea 100644 --- a/src/assets/pages/styles/theme-base.scss +++ b/src/assets/pages/styles/theme-base.scss @@ -49,10 +49,10 @@ $enable-rounded: true !default; } html{ - height:100% + height: 100% } body{ - height:100%; + height: 100%; } diff --git a/src/assets/pages/styles/theme-light.scss b/src/assets/pages/styles/theme-light.scss index d26d7d1..5f07d15 100644 --- a/src/assets/pages/styles/theme-light.scss +++ b/src/assets/pages/styles/theme-light.scss @@ -10,7 +10,7 @@ $theme-colors: ( "inactivecard": #ffffff, "activecard": #13a04a, "boxborder": #c0c2c6, - "activecardfont":#e1e4e8, + "activecardfont": #e1e4e8, "searchfont": #2c2c2c, "sidebarfill": #f6f6f6, "sidebartext": #545455, @@ -19,14 +19,14 @@ $theme-colors: ( "headertextcolor": #434344, "headertextcolorhover": #ffffff, "paragraphtextcolor": #434344, - "paragraphtextcolorhover":#ffffff, + "paragraphtextcolorhover": #ffffff, "themebuttonoutline": #434344, "categorybox": #ffffff, - "footertext:": #434344, + "footertext": #434344, ); .theme-button{ - width:40px; + width: 40px; height: 30px; background-size: contain; background-color: transparent; diff --git a/src/assets/pages/test-resources-landing-page2.html b/src/assets/pages/test-resources-landing-page2.html index 53bbeb2..bc589cf 100644 --- a/src/assets/pages/test-resources-landing-page2.html +++ b/src/assets/pages/test-resources-landing-page2.html @@ -18,113 +18,107 @@
- JDSfaulkner logo -  Steering Wheel + JDSfaulkner logo +  Steering Wheel Theme
- +
-
+
-
-
- -
-
- -
- - -
-
-
-
-
-
-
-
+
+
+
+
+ +
-
+
- - +
+ - diff --git a/src/assets/views/card-category.mustache b/src/assets/views/card-category.mustache index 694b40e..6272563 100644 --- a/src/assets/views/card-category.mustache +++ b/src/assets/views/card-category.mustache @@ -1,11 +1,11 @@
-
+

{{{category-id-clean}}}


{{{category-description}}}


- +

\ No newline at end of file diff --git a/src/ts_source/themes.ts b/src/ts_source/themes.ts index b667dbf..a931774 100644 --- a/src/ts_source/themes.ts +++ b/src/ts_source/themes.ts @@ -16,12 +16,9 @@ export module Themes { // initToggle.addClass(getButtonClassFromAppTheme(initThemeEnum)); initToggle.on("click", () => { let conf = Configurator.loadUserConfig(ConfigPaths.UserConfigName); - let toggle = $("#theme-toggle"); let themeValue = conf['theme']; let currTheme = getThemeFromValue(themeValue); let opposite = getOppositeTheme(currTheme); - // toggle.removeClass(getButtonClassFromAppTheme(currTheme)); - // toggle.addClass(getButtonClassFromAppTheme(opposite)); applyTheme(opposite); conf['theme'] = opposite; Configurator.saveUserConfig(ConfigPaths.UserConfigName, conf); diff --git a/src/ts_source/viewFactory.ts b/src/ts_source/viewFactory.ts index b3ae14e..8e04b90 100644 --- a/src/ts_source/viewFactory.ts +++ b/src/ts_source/viewFactory.ts @@ -48,24 +48,29 @@ export function buildWebCardsFromConfig(configName: string) { let containerElem = $(`#${containerName}`); let containerCategories = Object.keys(containerObject); + for (let j = 0, m = containerCategories.length; j < m; j++) { let categoryMetaObjectKey = containerCategories[j]; let categoryMetaObject = containerObject[categoryMetaObjectKey]; let contentList = categoryMetaObject["cards"];//should be array of objects to render let categoryDescription = categoryMetaObject["description"]; - let categoryKey = categoryMetaObjectKey.replace(/[\s,]/ig, '-'); - let categoryObject = {"category-description": categoryDescription, "category-id": categoryKey, "category-id-clean":categoryMetaObjectKey}; + let categoryKey = categoryMetaObjectKey.replace(/[\s,]/ig, '-').toLowerCase(); + let categoryObject = { + "category-description": categoryDescription, + "category-key": categoryKey, + "category-id-clean": categoryMetaObjectKey + }; let categoryWrapperRaw = loadTemplate("card-category.mustache", categoryObject, (x) => { }); let categoryWrapper = $(categoryWrapperRaw); containerElem.append(categoryWrapper); - let view = $(`#${categoryMetaObjectKey}-container`); - let collapseButton = $(`#${categoryMetaObjectKey}-collapser`); + let view = $(`#${categoryKey}-container`); + let collapseButton = $(`#${categoryKey}-collapser`); collapseButton.on("click", () => { - let collapsable = $(`#${categoryMetaObjectKey}-container`); + let collapsable = $(`#${categoryKey}-container`); if ("none" === collapsable.css('display')) { collapsable.css("display", ""); } else {