diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx index fd88fb74859..54b1f24ef02 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx @@ -117,8 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Admin + + Dynamic Content Type Manager Content Types @@ -126,9 +126,6 @@ Data Types - - DCC - Content Manager @@ -294,4 +291,7 @@ Language + + Actions + \ No newline at end of file diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js index c2bfb110d24..b7d30ffe319 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js @@ -6,6 +6,7 @@ var menuClick = function (target, panel) { $rootElement.find(".dccMenu li").removeClass("selected"); + $rootElement.find(".dccPanel").hide(); var listItem = $(target); @@ -19,15 +20,7 @@ return; } - //slide panels in - var zIndex = $(panel).css("z-index"); - $(panel).css("z-index", zIndex + 10); - $(activePanel).animate({ opacity: 0 }, 400, function () { - $(this).offset({ left: -850 }); - $(this).css("opacity", 1); - $(panel).animate({ left: 0 }, 1500); - $(panel).css("z-index", zIndex); - }); + $(panel).show(); activePanel = panel; }; diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj index 725f2d83846..0e30251dc08 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj @@ -138,6 +138,12 @@ + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html index 71fc135d0ae..8b26cd1006b 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html @@ -18,42 +18,31 @@ [Css:{ path: "~/Resources/Shared/components/CodeEditor/lib/codemirror.css"}] - - - [Resx:{key:"DCC"}] - [Resx:{key:"Admin"}] + + [Resx:{key:"DCC_Admin"}] + + + + + + - [Resx:{key:"ContentTypes"}] - [Resx:{key:"DataTypes"}] - [Resx:{key:"Templates"}] - [Resx:{key:"Settings"}] - - - - - - - - - - - @@ -66,7 +55,7 @@ [Resx:{key:"ContentType"}] [Resx:{key:"Created"}] [Resx:{key:"System"}] - + [Resx:{key:"Actions"}] @@ -87,7 +76,7 @@ - + @@ -137,7 +126,7 @@ [Resx:{key:"Name"}] [Resx:{key:"Label"}] [Resx:{key:"DataType"}] - + [Resx:{key:"Actions"}] @@ -212,7 +201,7 @@ - + @@ -224,48 +213,48 @@ - - [Resx:{key:"DataType"}] - [Resx:{key:"Created"}] - [Resx:{key:"System"}] - + + [Resx:{key:"DataType"}] + [Resx:{key:"Created"}] + [Resx:{key:"System"}] + - - - - - + + + + + - - - - - - [Resx:{key:"Name"}] - - - - [Resx:{key:"BaseType"}] - - - - - [Resx:{key:"SystemType"}] - + + + + + + [Resx:{key:"Name"}] + - - - [Resx:{key:"Delete"}] - [Resx:{key:"Cancel"}] - [Resx:{key:"Save"}] + + [Resx:{key:"BaseType"}] + + + + [Resx:{key:"SystemType"}] + + - + + [Resx:{key:"Delete"}] + [Resx:{key:"Cancel"}] + [Resx:{key:"Save"}] - - + + + + + @@ -284,7 +273,7 @@ - + @@ -292,28 +281,28 @@ - - [Resx:{key:"Template"}] - [Resx:{key:"ContentType"}] - [Resx:{key:"System"}] - - + + [Resx:{key:"Template"}] + [Resx:{key:"ContentType"}] + [Resx:{key:"System"}] + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -352,12 +341,8 @@ - - - - - - + + @@ -368,10 +353,10 @@ - - - + + + diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/compilerconfig.json b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/compilerconfig.json new file mode 100644 index 00000000000..4568bd711c2 --- /dev/null +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/compilerconfig.json @@ -0,0 +1,12 @@ +[ + { + "outputFile": "module.css", + "inputFile": "module.less", + "minify": { + "enabled": false + }, + "includeInProject": true, + "sourceMap": false, + "options": {} + } +] \ No newline at end of file diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.css b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.css index 325e1ecfc6c..beb48ff4eef 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.css +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.css @@ -1,519 +1,429 @@ -.dccContainer{ -} - -.dccContainer .dccNavBar{ - width: 100px; - background-color: #092836; - height: 702px; - float: left -} - -.dccContainer .dccNavBar .dccLogo{ - color: white; - margin-bottom: 25px; -} - -.dccContainer .dccNavBar .dccLogo div{ - color: white; - margin-left: 25px; - margin-right: 25px; - font-size: 20px; - text-align: center; -} -.dccContainer .dccNavBar .dccLogo div.top{ - padding-top: 20px; - padding-bottom: 10px; - border-bottom: solid 3px white; -} - -.dccContainer .dccNavBar .dccLogo div.bottom{ - padding-top: 10px; - padding-bottom: 20px; -} - -.dccContainer .dccNavBar .dccMenu ul{ - margin-left: 5px; - margin-right: 5px -} - -.dccContainer .dccNavBar .dccMenu ul li{ - color: white; - text-align: center; - list-style-type: none; - cursor: pointer; -} - -.dccContainer .dccNavBar .dccMenu ul li.selected{ - color: #0087c6; -} - -.dccContainer .dccNavBar .dccMenu ul li .fa{ - font-size: 40px; - display: block; -} - -.dccContainer .dccNavBar .dccMenu ul li div{ - padding-top:10px; - padding-bottom: 25px; -} -.dccContainer .dccPanels{ - margin-left: 100px; - height: 700px; - width: 850px; - border: solid 1px #092836; - background-color:white; - overflow: hidden; - position: absolute; -} - -.dccContainer .dccPanels .dccPanel{ - position: absolute; - height: 600px; - width: 850px; -} - -.dccContainer .dccExtraMargin { - margin-top: 25px; -} - -.dccContainer .dccHeading{ - font-size: 28px; - padding-top: 25px; - padding-bottom: 10px; - margin-left: 25px; - margin-right: 25px; - border-bottom: solid 2px #092836; -} - -.dccContainer .dccHeading a{ - float: right; -} - -.dccContainer div.dccLanguageSelector{ - float: right; - display: inline-block; - padding-top: 15px; - padding-right: 25px; -} - -.dccContainer div.dccLanguageSelector span{ - font-size: 16px; -} - -.dccContainer div.dccLanguageSelector select{ - margin-bottom: 0px; - padding: 2px 5px 5px 5px; - font-size:15px; -} - -.dccContainer .dccPanels .dccPanel .dccSubPanel{ - position: absolute; - width: 800px; - margin-left: 25px; - margin-top: 10px; - margin-right: 25px; - margin-bottom: 25px; - border: solid 1px #aaa; - border-radius: 5px; -} - -.dccContainer .dccPanels .dccPanel > .dccSubPanel{ - margin-top: 25px; -} - -.dccContainer #contentTypes-editView { - height:600px; -} - -.dccContainer .dccSearchPanel{ - padding: 15px; - border-bottom: 1px solid #aaa; - border-top-left-radius: 5px; - border-top-right-radius: 5px; -} - -.dccContainer .dccSearchPanel>.dccSearchBox{ - padding: 8px; - border: 1px solid #aaa; - width: 250px; - border-radius: 3px; - margin-bottom: 0; - display: inline-block; - background-image: url(images/search.png); - background-repeat: no-repeat; - background-position: 240px 8px; -} - -.dccContainer .dccTable{ - width: 100%; - border-collapse: collapse; - border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; -} - -.dccContainer .dccTable th{ - padding: 6px 0 6px 0; - border-left: 1px solid #aaa; - border-bottom: 1px solid #aaa; -} - -.dccContainer .dccTable th:first-child, .dccContainer .dccTable td:first-child{ - border-left: none; - text-align: left; -} - -.dccContainer .dccTable th, .dccContainer .dccTable td { - padding: 8px 9px 7px 9px; - text-align: center; - height: 20px; -} - +/*Colors*/ +/*Units*/ +input[type="text"], +select, +textarea, +input[type="email"], +input[type="search"], +input[type="password"] { + padding: 9px; +} +.dccContainer { + border: solid 1px #aaaaaa; + width: 950px; +} +.dccContainer .dccHeading { + width: 950px; + padding-top: 25px; + padding-bottom: 10px; + border-bottom: solid 1px #aaaaaa; + background-color: white; + box-shadow: 0px 2px 2px #aaaaaa; +} +.dccContainer .dccHeading span { + font-size: 28px; + margin-left: 20px; +} +.dccContainer .dccHeading a.dccIcon { + float: right; + font-size: 28px; + margin-right: 20px; + padding: 0px; +} +.dccContainer .dccBody { + margin: 20px; + width: 910px; + background-color: white; + border: solid 1px #aaaaaa; + border-radius: 4px; +} +.dccContainer .dccMenu ul { + display: inline-block; + margin-left: 0px; + margin-bottom: 0px; + width: 909px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + background-color: #eeeeee; + padding-left: 1px; +} +.dccContainer .dccMenu ul > li { + float: left; + list-style: none; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} +.dccContainer .dccMenu ul > li > div { + width: 100px; + padding: 12px 15px 10px 15px; + cursor: pointer; +} +.dccContainer .dccMenu ul > li.selected { + background-color: white; +} +.dccContainer .dccMenu ul > li.selected { + background-color: white; + color: #0087c6; +} +.dccContainer .dccPanel { + width: 910px; +} +.dccContainer .dccSearchPanel { + padding: 15px; + border-bottom: 1px solid #aaaaaa; +} +.dccContainer .dccSearchPanel > .dccSearchBox { + padding: 8px; + border: 1px solid #aaaaaa; + width: 250px; + border-radius: 3px; + margin-bottom: 0; + display: inline-block; + background-image: url(images/search.png); + background-repeat: no-repeat; + background-position: 240px 8px; +} +.dccContainer .dccTable { + width: 100%; + border-collapse: collapse; + border-bottom: 1px solid #aaaaaa; +} +.dccContainer .dccTable th { + border-left: 1px solid #aaaaaa; + border-bottom: 1px solid #aaaaaa; +} +.dccContainer .dccTable th, +.dccContainer .dccTable td { + padding: 8px 5px 7px 5px; + text-align: center; + height: 20px; +} +.dccContainer .dccTable th:first-child, +.dccContainer .dccTable td:first-child { + padding: 8px 5px 7px 15px; + border-left: none; + text-align: left; +} .dccContainer .dccTable tr:nth-child(2n) td { - background: #ddd; + background: #eeeeee; } - -.dccContainer .dccTable .fa{ - font-size: 18px; +.dccContainer .dccTable .fa { + font-size: 18px; } - -.dccContainer .dccTable tfoot{ - border-top: 1px solid #aaa; - border-bottom-left-radius: 8px; - border-bottom-right-radius: 5px; +.dccContainer .dccTable tfoot { + border-top: 1px solid #aaaaaa; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 5px; } - .dccContainer .dccTable tfoot td > div > div { - margin-top: 6px; + margin-top: 6px; } - .dccContainer .dccTable tfoot td > div > div.left { - margin-bottom: 6px; -} - -.dccContainer .dccTable tr.in-edit-row td, .dccContainer .dccTable tr.in-edit-row:hover td{ - background: #0087c6; - color: #fff; - border-color: #0087c6; -} - -.dccContainer .dccTable tr.edit-row td, .dccContainer .dccTable tr.edit-row:hover td{ - background-color: transparent; -} - -.dccContainer ul.pager{ - display: block; - list-style-type: none; - margin: 0 5px 0 8px; - padding: 0; -} - -.dccContainer ul.pager > li{ - display: inline-block; - list-style-type: none; -} - -.dccContainer .dccTable td a{ - color: #0087c6; - text-decoration: none; -} - -.dccContainer .dccTable td a.prev, .dccContainer .dccTable td a.next{ - background-position: center center; - background-repeat: no-repeat; - border: 1px solid #ddd; - width: 25px; - height: 25px; - display: block; - cursor: pointer; - border-radius: 2px; - background-color: #fff; -} - + margin-bottom: 6px; +} +.dccContainer .dccTable tr.in-edit-row td, +.dccContainer .dccTable tr.in-edit-row:hover td { + background: #0087c6; + color: white; + border-color: #0087c6; +} +.dccContainer .dccTable tr.edit-row td, +.dccContainer .dccTable tr.edit-row:hover td { + background-color: transparent; +} +.dccContainer ul.pager { + display: block; + list-style-type: none; + margin: 0 10px 0 8px; + padding: 0; +} +.dccContainer ul.pager > li { + display: inline-block; + list-style-type: none; +} +.dccContainer .dccTable td a { + color: #0087c6; + text-decoration: none; +} +.dccContainer .dccTable td a.prev, +.dccContainer .dccTable td a.next { + background-position: center center; + background-repeat: no-repeat; + border: 1px solid #aaaaaa; + width: 25px; + height: 25px; + display: block; + cursor: pointer; + border-radius: 2px; + background-color: white; +} .dccContainer .dccTable td a.prev { - background-image: url('images/left.png'); + background-image: url('images/left.png'); } - .dccContainer .dccTable td a.next { - background-image: url('images/right.png'); + background-image: url('images/right.png'); } - -.dccContainer .dccTable td a.prev.disabled, .dccContainer .dccTable td a.next.disabled { - opacity: 0.50; - cursor: default; +.dccContainer .dccTable td a.prev.disabled, +.dccContainer .dccTable td a.next.disabled { + opacity: 0.5; + cursor: default; } - -.dccContainer .dccTable tr.edit-row td, .dccContainer .dccTable tr.edit-row:hover td { - padding: 0; +.dccContainer .dccTable tr.edit-row td, +.dccContainer .dccTable tr.edit-row:hover td { + padding: 0; } - .dccContainer div.dccEditForm { - padding: 10px 9px 10px 9px; - min-height: 135px; + padding: 15px; + min-height: 135px; } - .dccContainer .dccTable div.dccEditForm { - border-bottom: 2px solid #0087c6; + border-bottom: 2px solid #0087c6; } - .dccContainer div.dccEditRow { - float: left; - width: 100%; + float: left; + width: 100%; } - .dccContainer div.dccEditRow > div { - float: left; - margin-right: 25px; + float: left; + margin-right: 25px; } - .dccContainer .dccTable div.dccEditRow > div { - width: 33%; - float: left; - margin: 0 0 9px 0; - position: relative; -} - -.dccContainer div.dccEditRow > div > label{ - display:block; - cursor: default; -} - -.dccContainer div.dccEditRow > div > textarea{ - height: 35px; - width: 750px; -} - -.dccContainer div.dccEditRow > div > input, .dccContainer div.dccEditRow > div > textarea, .dccContainer div.dccEditRow > div > select{ - margin-bottom: 10px; -} - -.dccContainer div.dccEditRow > div > input{ - width: 220px; -} - -.dccContainer div.dccEditRow > div > input.dccWide{ - width: 500px; -} - -.dccContainer div.dccEditRow > div > textarea.dccCode{ - width:750px; - height:350px + width: 33%; + float: left; + margin: 0 0 9px 0; + position: relative; +} +.dccContainer div.dccEditRow > div > label { + display: block; + cursor: default; +} +.dccContainer div.dccEditRow > div > textarea { + height: 35px; + width: 862px; +} +.dccContainer div.dccEditRow > div > input, +.dccContainer div.dccEditRow > div > textarea, +.dccContainer div.dccEditRow > div > select { + margin-bottom: 10px; +} +.dccContainer div.dccEditRow > div > input { + width: 220px; +} +.dccContainer div.dccEditRow > div > input.dccWide { + width: 500px; +} +.dccContainer div.dccEditRow > div > textarea.dccCode { + width: 750px; + height: 350px; } .dccContainer div.dccEditRow > div.toggle { - float: right; - padding-right: 25px; - padding-top: 25px; + float: right; + padding-right: 0px; + padding-top: 25px; + margin-right: 0px; } - .dccContainer .dccTable div.dccEditRow > div.toggle { - padding-top:25px; - padding-right: 0px; + padding-top: 25px; + padding-right: 0px; } - .dccContainer div.dccEditRow > div.toggle > span { - vertical-align: middle; - margin-left: 15px; + vertical-align: middle; + margin-left: 15px; } - .dccContainer div.dccEditRow > div.toggle > span.label { - padding-bottom: 15px; - display: inline-block; + padding-bottom: 15px; + display: inline-block; } - .dccContainer .dnnCheckbox { - display: inline-block; - width: 41px; - height: 18px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; - background-color: #ccc; - margin: 0; - cursor: pointer; - -webkit-transition: background 100ms linear; - -moz-transition: background 100ms linear; - -o-transition: background 100ms linear; - transition: background 100ms linear; -} - + display: inline-block; + width: 41px; + height: 18px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; + background-color: #cccccc; + margin: 0; + cursor: pointer; + -webkit-transition: background 100ms linear; + -moz-transition: background 100ms linear; + -o-transition: background 100ms linear; + transition: background 100ms linear; +} .dccContainer .dnnCheckbox.dnnCheckbox-checked { - background-color: #48d348; + background-color: #48d348; } - .dccContainer div.toggle.disabled .dnnCheckbox.dnnCheckbox-checked { - background-color: #ccc; + background-color: #cccccc; } - .dccContainer .dnnCheckbox .mark { - width: 22px; - height: 22px; - display: inline-block; - -webkit-border-radius: 11px; - -moz-border-radius: 11px; - border-radius: 11px; - background-color: #fff; - border: 2px solid #b5b5b5; - position: relative; - top: -2px; - left: 0px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: left 100ms linear; - -moz-transition: left 100ms linear; - -o-transition: left 100ms linear; - transition: left 100ms linear; -} - -.dccContainer .dnnCheckbox.dnnCheckbox-checked .mark { - left: 19px; -} - + width: 22px; + height: 22px; + display: inline-block; + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + border-radius: 11px; + background-color: white; + border: 2px solid #b5b5b5; + position: relative; + top: -2px; + left: 0px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: left 100ms linear; + -moz-transition: left 100ms linear; + -o-transition: left 100ms linear; + transition: left 100ms linear; +} +.dccContainer .dnnCheckbox.dnnCheckbox-checked .mark { + left: 19px; +} .dccContainer .dnnCheckbox .mark img { - display: none; + display: none; } - .dccContainer div.dccEditForm > div.buttons { - clear: both; - width: 100%; - padding-top: 10px; - text-align: center; + clear: both; + width: 100%; + padding-top: 10px; + text-align: center; } - .dccContainer .dccButton { - background: #fff; - color: #666; - display: inline-block; - padding: 9px 9px; - cursor: pointer; - min-width: 75px; - border-radius: 3px; - text-decoration: none; - font-size: 13px; - border: 1px solid #aaa; - text-align: center; -} - -.dccContainer div.dccEditForm > div > a.primarybtn, .dccContainer div.dccEditForm > div > a.secondarybtn { - margin-left: 5px; -} - + background: white; + color: #333333; + display: inline-block; + padding: 9px 9px; + cursor: pointer; + min-width: 75px; + border-radius: 3px; + text-decoration: none; + font-size: 13px; + border: 1px solid #aaaaaa; + text-align: center; +} +.dccContainer div.dccEditForm > div > a.primarybtn, +.dccContainer div.dccEditForm > div > a.secondarybtn { + margin-left: 5px; +} .dccContainer a.primarybtn { - background: #0087c6; - color: #fff !important; - display: inline-block; - padding: 9px 9px; - cursor: pointer; - min-width: 75px; - border-radius: 3px; - text-decoration: none; - text-align: center; - font-size: 13px; -} - + background: #0087c6; + color: white !important; + display: inline-block; + padding: 9px 9px; + cursor: pointer; + min-width: 75px; + border-radius: 3px; + text-decoration: none; + text-align: center; + font-size: 13px; +} .dccContainer a.secondarybtn { - background: #e4e4e4; - color: #0e181c !important; - display: inline-block; - padding: 9px 9px; - cursor: pointer; - min-width: 75px; - border-radius: 3px; - text-decoration: none; - text-align: center; - font-size: 13px; -} - + background: #e4e4e4; + color: #333333 !important; + display: inline-block; + padding: 9px 9px; + cursor: pointer; + min-width: 75px; + border-radius: 3px; + text-decoration: none; + text-align: center; + font-size: 13px; +} .dccContainer #loadingbar { - top: 0; - left: 0; - z-index: 99999; - width: 860px; - height: 4px; - display: none; -} - + top: 0; + left: 0; + z-index: 99999; + width: 860px; + height: 4px; + display: none; +} .dccContainer #loadingbar > div { - background-color: #0087c6; - top: 0; - left: 100px; - height: 4px; + background-color: #0087c6; + top: 0; + left: 100px; + height: 4px; } - .dccContainer .dnnFormPopup { - left: 250px; - top: 250px; - width: 300px; + left: 250px; + top: 250px; + width: 300px; } - .dccContainer .dnnDialogHeader { - border-bottom: 1px solid #ddd; - font-size: 18px; - font-weight: bold; - padding-bottom: 18px; -} - -.dccContainer #mask{ - position: absolute; - background: transparent; - top: 0; - bottom: 0; - left: 0; - right: 0; - z-index: 9999; - display: none; -} - + border-bottom: 1px solid #dddddd; + font-size: 18px; + font-weight: bold; + padding-bottom: 18px; +} +.dccContainer #mask { + position: absolute; + background: transparent; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 9999; + display: none; +} .dccContainer .buttonpanel { - margin: .5em 0 0 0; - padding: .3em 1em 0em 0em; - overflow: hidden; - border-width: 1px 0 0 0; - background-image: none; - text-align: left; - border-top: 1px solid #ddd; -} - + margin: 0.5em 0 0 0; + padding: 0.3em 1em 0em 0em; + overflow: hidden; + border-width: 1px 0 0 0; + background-image: none; + text-align: left; + border-top: 1px solid #dddddd; +} .dccContainer a.dccIcon { - padding: 0px 5px 0px 5px; - cursor: pointer; + padding: 0px 5px 0px 5px; + cursor: pointer; } - .dccContainer .dccSubSubPanel { - width: 750px; - margin-top:10px; - margin-bottom: 10px; - padding:9px; - border: solid 1px #aaaaaa; - border-radius: 5px; - height: 340px; -} - + margin-top: 10px; + margin-bottom: 10px; + padding-top: 9px; + padding-bottom: 9px; + border: solid 1px #aaaaaa; + border-radius: 5px; +} .dccContainer .dccSubSubPanel .dccSubHeading { - min-height: 50px; + min-height: 50px; } - .dccContainer .dccSubSubPanel .dccSubHeading span { - font-size: 18px; - padding-top: 10px; - display: inline-block; + font-size: 18px; + padding-top: 10px; + display: inline-block; } - .dccContainer .dccSubSubPanel .dccTable { - border: solid 1px #aaa; + border-top: solid 1px #aaaaaa; + border-bottom: none; } - .dccContainer .dccSubHeading { - margin-left: 25px; + margin-left: 15px; + margin-right: 15px; } - .dccContainer .dccSubHeading span { - font-size: 18px; - padding-top: 10px; - display: inline-block; + font-size: 18px; + padding-top: 10px; + display: inline-block; } - .dccContainer div.CodeMirror { - width: 775px; - border: solid 1px #aaa; - margin-top: 20px; -} \ No newline at end of file + width: 775px; + border: solid 1px #aaaaaa; + margin-top: 20px; +} +.dccContainer .dccExtraMargin { + margin-top: 25px; +} +.dccContainer div.dccLanguageSelector { + float: right; + display: inline-block; + padding-top: 15px; + padding-right: 25px; +} +.dccContainer div.dccLanguageSelector span { + font-size: 16px; +} +.dccContainer div.dccLanguageSelector select { + margin-bottom: 0px; + padding: 2px 5px 5px 5px; + font-size: 15px; +} diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.less b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.less new file mode 100644 index 00000000000..5f2380532dd --- /dev/null +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/module.less @@ -0,0 +1,519 @@ +/*Colors*/ +@border_color: #aaa; +@panel_background_color: #fff; +@tab_background_color: #eee; +@selectedTab_background_color: #fff; +@selectedTab_color: #0087c6; +@header_background_color: #fff; +@grid_alt_background_color: #eee; + +@primaryBtn_background_color: #0087c6; +@primaryBtn_color: #fff; +@secondaryBtn_background_color: #e4e4e4; +@secondaryBtn_color: #333; +@otherBtn_background_color: #fff; +@otherBtn_color: #333; + +/*Units*/ +@width: 950px; +@panel_OuterMargin: 20px; +@panel_InnerMargin: 15px; +@panel_width: @width - 2 * @panel_OuterMargin; +@textBox_padding: 9px; +@panel_innerWidth: @panel_width - 2 * @panel_InnerMargin - 2 * @textBox_padding; + +@border_radius: 4px; + +@tab_width: 100px; + +@heading_fontSize: 28px; +@closeButton_fontSize: 28px; + +input[type="text"], select, textarea, input[type="email"], input[type="search"], input[type="password"] { + padding: @textBox_padding; +} + +.dccContainer{ + border: solid 1px @border_color; + width: @width; +} + +.dccContainer .dccHeading{ + width: @width; + padding-top: 25px; + padding-bottom: 10px; + border-bottom: solid 1px @border_color; + background-color: @header_background_color; + box-shadow: 0px 2px 2px @border_color; +} + +.dccContainer .dccHeading span{ + font-size: @heading_fontSize; + margin-left: @panel_OuterMargin; +} + +.dccContainer .dccHeading a.dccIcon{ + float: right; + font-size: @closeButton_fontSize; + margin-right: @panel_OuterMargin; + padding: 0px; +} + +.dccContainer .dccBody { + margin: @panel_OuterMargin; + width: @panel_width; + background-color: @panel_background_color; + border: solid 1px @border_color; + border-radius: 4px; +} + +.dccContainer .dccMenu ul { + display: inline-block; + margin-left: 0px; + margin-bottom: 0px; + width: @panel_width - 1; + border-top-left-radius: @border_radius; + border-top-right-radius: @border_radius; + background-color: @tab_background_color; + padding-left: 1px; +} + +.dccContainer .dccMenu ul > li { + float: left; + list-style: none; + border-top-left-radius: @border_radius; + border-top-right-radius: @border_radius; +} + +.dccContainer .dccMenu ul > li > div { + width: @tab_width; + padding: 12px @panel_InnerMargin 10px @panel_InnerMargin; + cursor: pointer; +} + +.dccContainer .dccMenu ul > li.selected { + background-color: @selectedTab_background_color; +} + +.dccContainer .dccMenu ul > li.selected { + background-color: @selectedTab_background_color; + color: @selectedTab_color; +} + +.dccContainer .dccPanel{ + width: @panel_width; +} + +.dccContainer .dccSearchPanel{ + padding: @panel_InnerMargin; + border-bottom: 1px solid @border_color; +} + +.dccContainer .dccSearchPanel>.dccSearchBox{ + padding: 8px; + border: 1px solid @border_color; + width: 250px; + border-radius: 3px; + margin-bottom: 0; + display: inline-block; + background-image: url(images/search.png); + background-repeat: no-repeat; + background-position: 240px 8px; +} + +.dccContainer .dccTable{ + width: 100%; + border-collapse: collapse; + border-bottom: 1px solid @border_color; +} + +.dccContainer .dccTable th{ + border-left: 1px solid @border_color; + border-bottom: 1px solid @border_color; +} + +.dccContainer .dccTable th, .dccContainer .dccTable td { + padding: 8px 5px 7px 5px; + text-align: center; + height: 20px; +} + +.dccContainer .dccTable th:first-child, .dccContainer .dccTable td:first-child{ + padding: 8px 5px 7px @panel_InnerMargin; + border-left: none; + text-align: left; +} + +.dccContainer .dccTable tr:nth-child(2n) td { + background: @grid_alt_background_color; +} + +.dccContainer .dccTable .fa{ + font-size: 18px; +} + +.dccContainer .dccTable tfoot{ + border-top: 1px solid @border_color; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 5px; +} + +.dccContainer .dccTable tfoot td > div > div { + margin-top: 6px; +} + +.dccContainer .dccTable tfoot td > div > div.left { + margin-bottom: 6px; +} + +.dccContainer .dccTable tr.in-edit-row td, .dccContainer .dccTable tr.in-edit-row:hover td{ + background: #0087c6; + color: #fff; + border-color: #0087c6; +} + +.dccContainer .dccTable tr.edit-row td, .dccContainer .dccTable tr.edit-row:hover td{ + background-color: transparent; +} + +.dccContainer ul.pager{ + display: block; + list-style-type: none; + margin: 0 10px 0 8px; + padding: 0; +} + +.dccContainer ul.pager > li{ + display: inline-block; + list-style-type: none; +} + +.dccContainer .dccTable td a{ + color: #0087c6; + text-decoration: none; +} + +.dccContainer .dccTable td a.prev, .dccContainer .dccTable td a.next{ + background-position: center center; + background-repeat: no-repeat; + border: 1px solid @border_color; + width: 25px; + height: 25px; + display: block; + cursor: pointer; + border-radius: 2px; + background-color: @panel_background_color; +} + +.dccContainer .dccTable td a.prev { + background-image: url('images/left.png'); +} + +.dccContainer .dccTable td a.next { + background-image: url('images/right.png'); +} + +.dccContainer .dccTable td a.prev.disabled, .dccContainer .dccTable td a.next.disabled { + opacity: 0.50; + cursor: default; +} + +.dccContainer .dccTable tr.edit-row td, .dccContainer .dccTable tr.edit-row:hover td { + padding: 0; +} + +.dccContainer div.dccEditForm { + padding: @panel_InnerMargin; + min-height: 135px; +} + +.dccContainer .dccTable div.dccEditForm { + border-bottom: 2px solid #0087c6; +} + +.dccContainer div.dccEditRow { + float: left; + width: 100%; +} + +.dccContainer div.dccEditRow > div { + float: left; + margin-right: 25px; +} + +.dccContainer .dccTable div.dccEditRow > div { + width: 33%; + float: left; + margin: 0 0 9px 0; + position: relative; +} + +.dccContainer div.dccEditRow > div > label{ + display:block; + cursor: default; +} + +.dccContainer div.dccEditRow > div > textarea{ + height: 35px; + width: @panel_innerWidth; +} + +.dccContainer div.dccEditRow > div > input, .dccContainer div.dccEditRow > div > textarea, .dccContainer div.dccEditRow > div > select{ + margin-bottom: 10px; +} + +.dccContainer div.dccEditRow > div > input{ + width: 220px; +} + +.dccContainer div.dccEditRow > div > input.dccWide{ + width: 500px; +} + +.dccContainer div.dccEditRow > div > textarea.dccCode{ + width:750px; + height:350px +} +.dccContainer div.dccEditRow > div.toggle { + float: right; + padding-right: 0px; + padding-top: 25px; + margin-right: 0px; +} + +.dccContainer .dccTable div.dccEditRow > div.toggle { + padding-top:25px; + padding-right: 0px; +} + +.dccContainer div.dccEditRow > div.toggle > span { + vertical-align: middle; + margin-left: 15px; +} + +.dccContainer div.dccEditRow > div.toggle > span.label { + padding-bottom: 15px; + display: inline-block; +} + +.dccContainer .dnnCheckbox { + display: inline-block; + width: 41px; + height: 18px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; + background-color: #ccc; + margin: 0; + cursor: pointer; + -webkit-transition: background 100ms linear; + -moz-transition: background 100ms linear; + -o-transition: background 100ms linear; + transition: background 100ms linear; +} + +.dccContainer .dnnCheckbox.dnnCheckbox-checked { + background-color: #48d348; +} + +.dccContainer div.toggle.disabled .dnnCheckbox.dnnCheckbox-checked { + background-color: #ccc; +} + +.dccContainer .dnnCheckbox .mark { + width: 22px; + height: 22px; + display: inline-block; + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + border-radius: 11px; + background-color: #fff; + border: 2px solid #b5b5b5; + position: relative; + top: -2px; + left: 0px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: left 100ms linear; + -moz-transition: left 100ms linear; + -o-transition: left 100ms linear; + transition: left 100ms linear; +} + +.dccContainer .dnnCheckbox.dnnCheckbox-checked .mark { + left: 19px; +} + +.dccContainer .dnnCheckbox .mark img { + display: none; +} + +.dccContainer div.dccEditForm > div.buttons { + clear: both; + width: 100%; + padding-top: 10px; + text-align: center; +} + +.dccContainer .dccButton { + background: @otherBtn_background_color; + color: @otherBtn_color; + display: inline-block; + padding: 9px 9px; + cursor: pointer; + min-width: 75px; + border-radius: 3px; + text-decoration: none; + font-size: 13px; + border: 1px solid @border_color; + text-align: center; +} + +.dccContainer div.dccEditForm > div > a.primarybtn, .dccContainer div.dccEditForm > div > a.secondarybtn { + margin-left: 5px; +} + +.dccContainer a.primarybtn { + background: @primaryBtn_background_color; + color: @primaryBtn_color !important; + display: inline-block; + padding: 9px 9px; + cursor: pointer; + min-width: 75px; + border-radius: 3px; + text-decoration: none; + text-align: center; + font-size: 13px; +} + +.dccContainer a.secondarybtn { + background: @secondaryBtn_background_color; + color: @secondaryBtn_color !important; + display: inline-block; + padding: 9px 9px; + cursor: pointer; + min-width: 75px; + border-radius: 3px; + text-decoration: none; + text-align: center; + font-size: 13px; +} + +.dccContainer #loadingbar { + top: 0; + left: 0; + z-index: 99999; + width: 860px; + height: 4px; + display: none; +} + +.dccContainer #loadingbar > div { + background-color: #0087c6; + top: 0; + left: 100px; + height: 4px; +} + +.dccContainer .dnnFormPopup { + left: 250px; + top: 250px; + width: 300px; +} + +.dccContainer .dnnDialogHeader { + border-bottom: 1px solid #ddd; + font-size: 18px; + font-weight: bold; + padding-bottom: 18px; +} + +.dccContainer #mask{ + position: absolute; + background: transparent; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 9999; + display: none; +} + +.dccContainer .buttonpanel { + margin: .5em 0 0 0; + padding: .3em 1em 0em 0em; + overflow: hidden; + border-width: 1px 0 0 0; + background-image: none; + text-align: left; + border-top: 1px solid #ddd; +} + +.dccContainer a.dccIcon { + padding: 0px 5px 0px 5px; + cursor: pointer; +} + +.dccContainer .dccSubSubPanel { + margin-top:10px; + margin-bottom: 10px; + padding-top:9px; + padding-bottom: 9px; + border: solid 1px @border_color; + border-radius: 5px; +} + +.dccContainer .dccSubSubPanel .dccSubHeading { + min-height: 50px; +} + +.dccContainer .dccSubSubPanel .dccSubHeading span { + font-size: 18px; + padding-top: 10px; + display: inline-block; +} + +.dccContainer .dccSubSubPanel .dccTable { + border-top: solid 1px @border_color; + border-bottom: none; +} + +.dccContainer .dccSubHeading { + margin-left: @panel_InnerMargin; + margin-right: @panel_InnerMargin; +} + +.dccContainer .dccSubHeading span { + font-size: 18px; + padding-top: 10px; + display: inline-block; +} + +.dccContainer div.CodeMirror { + width: @panel_innerWidth; + border: solid 1px @border_color; + margin-top: 20px; +} + +.dccContainer .dccExtraMargin { + margin-top: 25px; +} + +.dccContainer div.dccLanguageSelector{ + float: right; + display: inline-block; + padding-top: 15px; + padding-right: 25px; +} + +.dccContainer div.dccLanguageSelector span{ + font-size: 16px; +} + +.dccContainer div.dccLanguageSelector select{ + margin-bottom: 0px; + padding: 2px 5px 5px 5px; + font-size:15px; +} + diff --git a/DNN Platform/Website/Install/Config/08.00.00.config b/DNN Platform/Website/Install/Config/08.00.00.config index da73f027a20..f202c36f2d9 100644 --- a/DNN Platform/Website/Install/Config/08.00.00.config +++ b/DNN Platform/Website/Install/Config/08.00.00.config @@ -14,8 +14,8 @@ targetpath="/configuration/runtime/ab:assemblyBinding/ab:dependentAssembly[ab:assemblyIdentity/@name='Newtonsoft.Json']" collision="overwrite" nameSpace="urn:schemas-microsoft-com:asm.v1" nameSpacePrefix="ab"> - - + +