Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DNN-7093 Update UI for DCC Admin #648

Merged
merged 4 commits into from
Jul 20, 2015
Merged

DNN-7093 Update UI for DCC Admin #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8141920
DNN-7093 Update UI for DCC Admin
cnurse Jul 16, 2015
d73a949
DNN-7093 Update UI for DCC Admin
cnurse Jul 16, 2015
7e2dc19
DNN-7093 Update UI for DCC Admin
cnurse Jul 17, 2015
529171b
DNN-7093 Update UI for DCC Admin
cnurse Jul 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Admin.Text" xml:space="preserve">
<value>Admin</value>
<data name="DCC_Admin.Text" xml:space="preserve">
<value>Dynamic Content Type Manager</value>
</data>
<data name="ContentTypes.Text" xml:space="preserve">
<value>Content Types</value>
</data>
<data name="DataTypes.Text" xml:space="preserve">
<value>Data Types</value>
</data>
<data name="DCC.Text" xml:space="preserve">
<value>DCC</value>
</data>
<data name="ModuleTitle.Text" xml:space="preserve">
<value>Content Manager</value>
</data>
Expand Down Expand Up @@ -294,4 +291,7 @@
<data name="Language.Text" xml:space="preserve">
<value>Language</value>
</data>
<data name="Actions.Text" xml:space="preserve">
<value>Actions</value>
</data>
</root>
11 changes: 2 additions & 9 deletions DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

var menuClick = function (target, panel) {
$rootElement.find(".dccMenu li").removeClass("selected");
$rootElement.find(".dccPanel").hide();

var listItem = $(target);

Expand All @@ -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;
};
Expand Down
6 changes: 6 additions & 0 deletions ...atform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="module.less" />
</ItemGroup>
<ItemGroup>
<None Include="compilerconfig.json" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
Expand Down
159 changes: 72 additions & 87 deletions DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,31 @@
[Css:{ path: "~/Resources/Shared/components/CodeEditor/lib/codemirror.css"}]

<div id="DCCmanager-[ModuleContext:ModuleId]" class="dccContainer">
<div class="dccNavBar">
<div class="dccLogo">
<div class="top">[Resx:{key:"DCC"}]</div>
<div class="bottom">[Resx:{key:"Admin"}]</div>
<div class="dccHeading">
<span>[Resx:{key:"DCC_Admin"}]</span>
<div class="dccLanguageSelector" data-bind="visible: $root.isLocalized">
<span data-bind="text: $root.resx.language"></span>
<select data-bind="value: $root.selectedLanguage, options: $root.languages, optionsText: 'language', optionsValue: 'code'"></select>
</div>
<a class="dccIcon" data-bind="visible: $root.showCloseIcon(), click: closeEdit"><i class="fa fa-home"></i></a>
</div>
<div class="dccBody">
<div class="dccMenu">
<ul>
<li id="contentTypes-menu" data-bind="click: selectContentTypes">
<i class="fa fa-table"></i>
<div>[Resx:{key:"ContentTypes"}]</div>
</li>
<li id="dataTypes-menu" data-bind="click: selectDataTypes">
<i class="fa fa-list-alt"></i>
<div>[Resx:{key:"DataTypes"}]</div>
</li>
<li id="contentTemplates-menu" data-bind="click: selectTemplates">
<i class="fa fa-file-text-o"></i>
<div>[Resx:{key:"Templates"}]</div>
</li>
<li id="settings-menu" data-bind="click: selectSettings">
<i class="fa fa-gear"></i>
<div>[Resx:{key:"Settings"}]</div>
</li>
</ul>
</div>
</div>

<div class="dccPanels">
<div class="dccHeading">
<span data-bind="text: $root.heading()"></span>
<a class="dccIcon" data-bind="visible: $root.showCloseIcon(), click: closeEdit"><i class="fa fa-home"></i></a>
</div>
<div class="dccLanguageSelector" data-bind="visible: $root.isLocalized">
<span data-bind="text: $root.resx.language"></span>
<select data-bind="value: $root.selectedLanguage, options: $root.languages, optionsText: 'language', optionsValue: 'code'"></select>
</div>
<div class="dccPanel" id="content-types-panel" data-bind="with: contentTypes, css: { dccExtraMargin: $root.isLocalized() }">
<div id="contentTypes-listView" class="dccSubPanel" data-bind="visible: mode() == 'listTypes'">
<div class="dccSearchPanel">
Expand All @@ -66,7 +55,7 @@
<th>[Resx:{key:"ContentType"}]</th>
<th>[Resx:{key:"Created"}]</th>
<th>[Resx:{key:"System"}]</th>
<th width="100px">&nbsp;</th>
<th width="100px">[Resx:{key:"Actions"}]</th>
</tr>
</thead>
<tbody data-bind="foreach: results">
Expand All @@ -87,7 +76,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="3">
<td colspan="4">
<div>
<div class="left" data-bind="html: pagerItemsDescription"></div>
<ul class="right pager" data-bind="visible: pagerVisible">
Expand Down Expand Up @@ -137,7 +126,7 @@
<th>[Resx:{key:"Name"}]</th>
<th>[Resx:{key:"Label"}]</th>
<th>[Resx:{key:"DataType"}]</th>
<th width="100px">&nbsp;</th>
<th width="100px">[Resx:{key:"Actions"}]</th>
</tr>
</thead>
<tbody data-bind="foreach: contentFields()">
Expand Down Expand Up @@ -212,7 +201,7 @@
</div>
</div>
</div>
<div class="dccPanel" id="data-types-panel" style="left: -850px" data-bind="with: dataTypes, css: { dccExtraMargin: $root.isLocalized() }">
<div class="dccPanel" id="data-types-panel" style="display:none;" data-bind="with: dataTypes, css: { dccExtraMargin: $root.isLocalized() }">
<div class="dccSubPanel">
<div class="dccSearchPanel">
<input type="text" class="dccSearchBox" data-bind="value: searchText, valueUpdate: 'afterkeydown', attr: { 'placeholder': $root.resx.findDataType}"/>
Expand All @@ -224,48 +213,48 @@
</table>
<table class="dccTable">
<thead>
<tr>
<th>[Resx:{key:"DataType"}]</th>
<th>[Resx:{key:"Created"}]</th>
<th>[Resx:{key:"System"}]</th>
</tr>
<tr>
<th>[Resx:{key:"DataType"}]</th>
<th>[Resx:{key:"Created"}]</th>
<th>[Resx:{key:"System"}]</th>
</tr>
</thead>
<tbody data-bind="foreach: results">
<tr data-bind="click: $parent.editDataType">
<td data-bind="text: name"></td>
<td data-bind="text: created"></td>
<td><i class="fa fa-check-square-o" data-bind="visible: isSystem"></i><i class="fa fa-square-o" data-bind="visible: !isSystem"></i></td>
</tr>
<tr data-bind="click: $parent.editDataType">
<td data-bind="text: name"></td>
<td data-bind="text: created"></td>
<td><i class="fa fa-check-square-o" data-bind="visible: isSystem"></i><i class="fa fa-square-o" data-bind="visible: !isSystem"></i></td>
</tr>
</tbody>
<tbody id='dataTypes-editbody' class="edit-body">
<tr class="edit-row" id="dataTypes-editrow">
<td colspan="3" data-bind="with: selectedDataType">
<div class="dccEditForm">
<div class="dccEditRow">
<div>
<label>[Resx:{key:"Name"}]</label>
<input type="text" data-bind="value: name, enable: !isSystem() || parentViewModel.isSystemUser" />
</div>
<div>
<label>[Resx:{key:"BaseType"}]</label>
<select data-bind="value: baseType, valueAllowUnset: false, options: $parent.baseDataTypeOptions, optionsText: 'name', optionsValue: 'value', enable: !isSystem() || parentViewModel.isSystemUser"></select>
</div>
<div class="toggle" data-bind="css: { disabled: !(parentViewModel.isSystemUser && isAddMode()) }">
<span><input type="checkbox" data-bind="checked: isSystem, enable: parentViewModel.isSystemUser && isAddMode()"></span>
<span class="label">[Resx:{key:"SystemType"}]</span>
</div>
<tr class="edit-row" id="dataTypes-editrow">
<td colspan="3" data-bind="with: selectedDataType">
<div class="dccEditForm">
<div class="dccEditRow">
<div>
<label>[Resx:{key:"Name"}]</label>
<input type="text" data-bind="value: name, enable: !isSystem() || parentViewModel.isSystemUser" />
</div>

<div class="buttons">
<a class="secondarybtn" id="dataTypes-deleteButton" data-bind="click: deleteDataType, visible: !isAddMode()">[Resx:{key:"Delete"}]</a>
<a class="secondarybtn" data-bind="click: cancel">[Resx:{key:"Cancel"}]</a>
<a class="primarybtn" data-bind="click: saveDataType">[Resx:{key:"Save"}]</a>
<div>
<label>[Resx:{key:"BaseType"}]</label>
<select data-bind="value: baseType, valueAllowUnset: false, options: $parent.baseDataTypeOptions, optionsText: 'name', optionsValue: 'value', enable: !isSystem() || parentViewModel.isSystemUser"></select>
</div>
<div class="toggle" data-bind="css: { disabled: !(parentViewModel.isSystemUser && isAddMode()) }">
<span><input type="checkbox" data-bind="checked: isSystem, enable: parentViewModel.isSystemUser && isAddMode()"></span>
<span class="label">[Resx:{key:"SystemType"}]</span>
</div>
</div>

<div class="clear"></div>
<div class="buttons">
<a class="secondarybtn" id="dataTypes-deleteButton" data-bind="click: deleteDataType, visible: !isAddMode()">[Resx:{key:"Delete"}]</a>
<a class="secondarybtn" data-bind="click: cancel">[Resx:{key:"Cancel"}]</a>
<a class="primarybtn" data-bind="click: saveDataType">[Resx:{key:"Save"}]</a>
</div>
</td>
</tr>

<div class="clear"></div>
</div>
</td>
</tr>
</tbody>
<tfoot>
<tr>
Expand All @@ -284,36 +273,36 @@
</table>
</div>
</div>
<div class="dccPanel" id="content-templates-panel" style="left: -850px" data-bind="with: templates, css: { dccExtraMargin: $root.isLocalized() }">
<div class="dccPanel" id="content-templates-panel" style="display:none;" data-bind="with: templates, css: { dccExtraMargin: $root.isLocalized() }">
<div id="templates-listView" class="dccSubPanel" data-bind="visible: mode() == 'listTemplates'">
<div class="dccSearchPanel">
<input type="text" class="dccSearchBox" data-bind="value: searchText, valueUpdate: 'afterkeydown', attr: { 'placeholder': $root.resx.findTemplate}" />
<a class="dccButton right" data-bind="click: addTemplate">[Resx:{key:"AddTemplate"}]</a>
</div>
<table class="dccTable">
<thead>
<tr>
<th>[Resx:{key:"Template"}]</th>
<th>[Resx:{key:"ContentType"}]</th>
<th>[Resx:{key:"System"}]</th>
<th width="100px">&nbsp;</th>
</tr>
<tr>
<th>[Resx:{key:"Template"}]</th>
<th>[Resx:{key:"ContentType"}]</th>
<th>[Resx:{key:"System"}]</th>
<th width="100px">&nbsp;</th>
</tr>
</thead>
<tbody data-bind="foreach: results">
<tr>
<td data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected}">
<span data-bind="text: name"></span>
</td>
<td data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected}">
<span data-bind="text: contentType"></span>
</td>
<td data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected }"><i class="fa fa-check" data-bind="visible: isSystem"></i></td>
<td width="100px" data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected }">
<a class="dccIcon" data-bind="visible: selected() && !canEdit(), click: $parent.editTemplate"><i class="fa fa-search"></i></a>
<a class="dccIcon" data-bind="visible: selected() && canEdit(), click: $parent.editTemplate"><i class="fa fa-pencil"></i></a>
<a class="dccIcon" data-bind="visible: selected() && canEdit(), click: deleteTemplate""><i class="fa fa-trash-o"></i></a>
</td>
</tr>
<tr>
<td data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected}">
<span data-bind="text: name"></span>
</td>
<td data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected}">
<span data-bind="text: contentType"></span>
</td>
<td data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected }"><i class="fa fa-check" data-bind="visible: isSystem"></i></td>
<td width="100px" data-bind="event: { mouseover: toggleSelected, mouseout: toggleSelected }">
<a class="dccIcon" data-bind="visible: selected() && !canEdit(), click: $parent.editTemplate"><i class="fa fa-search"></i></a>
<a class="dccIcon" data-bind="visible: selected() && canEdit(), click: $parent.editTemplate"><i class="fa fa-pencil"></i></a>
<a class="dccIcon" data-bind="visible: selected() && canEdit(), click: deleteTemplate""><i class="fa fa-trash-o"></i></a>
</td>
</tr>
</tbody>
</table>
</div>
Expand Down Expand Up @@ -352,12 +341,8 @@
</div>
</div>
</div>
<div class="dccPanel" id="settings-panel" style="left: -850px">
<div class="dccHeading"></div>
<div class="dccSubPanel">

</div>
</div>
<div class="dccPanel" id="settings-panel" style="display:none;">
</div displa>

<div id="mask"></div>
<div id="confirmation-dialog" class="dnnFormPopup dnnClear" style="display: none;">
Expand All @@ -368,10 +353,10 @@
<a id="cancelbtn" class="dnnSecondaryAction"></a>
</div>
</div>
</div>

<div id="loadingbar" style="display: none;">
<div></div>
<div id="loadingbar" style="display: none;">
<div></div>
</div>
</div>
</div>

Expand Down
12 changes: 12 additions & 0 deletions DNN Platform/Modules/Dnn.Modules.DynamicContentManager/compilerconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"outputFile": "module.css",
"inputFile": "module.less",
"minify": {
"enabled": false
},
"includeInProject": true,
"sourceMap": false,
"options": {}
}
]
Loading