Skip to content
Snippets Groups Projects
Commit ebff1a1a authored by Kyle Doherty's avatar Kyle Doherty
Browse files

clean up

parent 7906cb06
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
resources/frontend_client/app/admin/datasets/partials/dataset_edit.html
+ 71
− 69
View file @ ebff1a1a
......@@ -6,82 +6,84 @@
</defs>
</svg>
<div class="pb2 clearfix" ng-if="table">
<div class="clearfix">
<div class="text-grey-3 float-right" ng-if="table.entity_name">
<p class="text-right">actual table name: {{table.name}}</p>
<p class="py1 text-right clearfix">
<a class="link float-right ml3" cv-org-href="/admin/datasets/{{table.id}}/dependents">List Dependents</a>
<a class="link float-right" ng-click="syncMetadata()">Sync Metadata</a>
</p>
</div>
<div class="float-left">
<h2 class="inline-block">
<a class="text-brand" href="#" ng-class="{EditedEntity: table.entity_name}" editable-text="table.entity_name" onaftersave="inlineSave()">
<span ng-if="table.entity_name">{{table.entity_name}}</span>
<section class="wrapper">
<div class="pb2 clearfix" ng-if="table">
<div class="clearfix">
<div class="text-grey-3 float-right" ng-if="table.entity_name">
<p class="text-right">actual table name: {{table.name}}</p>
<p class="py1 text-right clearfix">
<a class="link float-right ml3" cv-org-href="/admin/datasets/{{table.id}}/dependents">List Dependents</a>
<a class="link float-right" ng-click="syncMetadata()">Sync Metadata</a>
</p>
</div>
<div class="float-left">
<h2 class="inline-block">
<a class="text-brand" href="#" ng-class="{EditedEntity: table.entity_name}" editable-text="table.entity_name" onaftersave="inlineSave()">
<span ng-if="table.entity_name">{{table.entity_name}}</span>
<span ng-if="!table.entity_name">{{table.name}}</span>
</a>
</h2>
<label class="Select mx2 inline-block">
<select ng-class="{CustomTypeApplied: table.entity_type }" ng-model="table.entity_type" ng-change="inlineSave()" ng-options="ent_type.id as ent_type.name for ent_type in utils.table_entity_types">
</select>
</label>
<div class="text-grey-4 mt1">
<a e-class="full" href="#" ng-class="{EditedEntity: table.description }" editable-text="table.description" onaftersave="inlineSave()">
{{table.description}}
<span ng-if="!table.description">Add a description ...</span>
</a>
<span ng-if="!table.entity_name">{{table.name}}</span>
</a>
</h2>
<label class="Select mx2 inline-block">
<select ng-class="{CustomTypeApplied: table.entity_type }" ng-model="table.entity_type" ng-change="inlineSave()" ng-options="ent_type.id as ent_type.name for ent_type in utils.table_entity_types">
</select>
</label>
<div class="text-grey-4 mt1">
<a e-class="full" href="#" ng-class="{EditedEntity: table.description }" editable-text="table.description" onaftersave="inlineSave()">
{{table.description}}
<span ng-if="!table.description">Add a description ...</span>
</a>
</div>
</div>
</div>
</div>
<cv-annotation-form model="table" id="{{table.id}}"></cv-annotation-form>
</div>
<cv-annotation-form model="table" id="{{table.id}}"></cv-annotation-form>
</div>
<div class="DragBoundary mt2 border-bottom">
<ul as-sortable="dragControlListeners" ng-model="fields">
<li class="border-top py2 relative text-grey-3" ng-repeat="field in table.fields" as-sortable-item>
<div class="Drag-handle" title="Reorder" as-sortable-item-handle>
<svg width="9" height="36">
<rect class="Dragger" fill="url(#dragger)" width="6" height="42">
</svg>
</div>
<div class="ml3 mr1 clearfix">
<div class="float-right">
<span class="EntityOriginalType float-left">{{field.base_type}}</span>
<div class="DragBoundary mt2 border-bottom">
<ul as-sortable="dragControlListeners" ng-model="fields">
<li class="border-top py2 relative text-grey-3" ng-repeat="field in table.fields" as-sortable-item>
<div class="Drag-handle" title="Reorder" as-sortable-item-handle>
<svg width="9" height="36">
<rect class="Dragger" fill="url(#dragger)" width="6" height="42">
</svg>
</div>
<div>
<input ng-model="field.preview_display" type="checkbox" ng-change="inlineSaveField($index)">
<h3 class="text-bold inline-block">
<a class="link mr1" cv-org-href="/admin/datasets/field/{{field.id}}">{{field.name}}</a>
</h3>
<div class="ml3 mr1 clearfix">
<div class="float-right">
<span class="EntityOriginalType float-left">{{field.base_type}}</span>
</div>
<div>
<input ng-model="field.preview_display" type="checkbox" ng-change="inlineSaveField($index)">
<h3 class="text-bold inline-block">
<a class="link mr1" cv-org-href="/admin/datasets/field/{{field.id}}">{{field.name}}</a>
</h3>
<label class="Select mx1">
<select ng-class="{CustomTypeApplied: field.field_type }" ng-model="field.field_type" ng-change="inlineSaveField($index)" ng-options="spec_type.id as spec_type.name for spec_type in utils.field_field_types">
</select>
</label>
<label class="Select mx1">
<select ng-class="{CustomTypeApplied: field.special_type }" ng-model="field.special_type" ng-change="inlineSpecialTypeChange($index)" ng-options="spec_type.id as spec_type.name for spec_type in utils.field_special_types">
</select>
</label>
<label class="Select mx1" ng-if="field.special_type=='fk'">
<select ng-model="field.target_id" ng-change="inlineChangeFKTarget($index)" ng-options="idf.id as idf.displayName for idf in idfields">
<option value="" disabled selected>Target Field</option>
</select>
</label>
<label class="Select mx1">
<select ng-class="{CustomTypeApplied: field.field_type }" ng-model="field.field_type" ng-change="inlineSaveField($index)" ng-options="spec_type.id as spec_type.name for spec_type in utils.field_field_types">
</select>
</label>
<label class="Select mx1">
<select ng-class="{CustomTypeApplied: field.special_type }" ng-model="field.special_type" ng-change="inlineSpecialTypeChange($index)" ng-options="spec_type.id as spec_type.name for spec_type in utils.field_special_types">
</select>
</label>
<label class="Select mx1" ng-if="field.special_type=='fk'">
<select ng-model="field.target_id" ng-change="inlineChangeFKTarget($index)" ng-options="idf.id as idf.displayName for idf in idfields">
<option value="" disabled selected>Target Field</option>
</select>
</label>
</div>
<div class="pt1 full">
<a e-class="full" href="#" ng-class="{EditedEntity: field.description }" editable-text="field.description" onaftersave="inlineSaveField($index)">
{{field.description}}
<span ng-if="!field.description">Add a description...</span>
</a>
</div>
</div>
<div class="pt1 full">
<a e-class="full" href="#" ng-class="{EditedEntity: field.description }" editable-text="field.description" onaftersave="inlineSaveField($index)">
{{field.description}}
<span ng-if="!field.description">Add a description...</span>
</a>
<div class="mt2 ml3 mr1">
<cv-annotation-form model="field" id="{{field.id}}"></cv-annotation-form>
</div>
</div>
<div class="mt2 ml3 mr1">
<cv-annotation-form model="field" id="{{field.id}}"></cv-annotation-form>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</section>
resources/frontend_client/app/admin/people/partials/people.html
+ 1
− 1
View file @ ebff1a1a
<div>
<div class="wrapper">
<div ng-cloak>
<alert class="alert" ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)" ng-animate=" 'animate' " cv-delayed-call="closeAlert($index)">{{alert.msg}}</alert>
</div>
......
resources/frontend_client/index.html
+ 20
− 51
View file @ ebff1a1a
......@@ -81,59 +81,28 @@
</div>
</nav>
<nav ng-show="nav == 'admin'">
<div class="border-bottom bg-white py1">
<div class="wrapper">
<label class="Select" ng-if="user.is_multi_org">
<select ng-change="changeCurrOrg(currentOrgSlug)" ng-model="currentOrgSlug" ng-options="organization.slug as organization.name for organization in userAdminOf"></select>
</select>
</label>
<a cv-org-href="/admin/">
<h3 class="AdminPageTitle my2 inline-block">
<span ng-if="!user.is_multi_org">{{currentOrg.name}} - </span>Admin
</h3>
</a>
<div class="mx1 my2 float-right">
<a class="inline-block" cv-org-href="/">Exit Admin</a>
</div>
<nav class="bg-white py1" ng-show="nav == 'admin'">
<div class="wrapper">
<label class="Select" ng-if="user.is_multi_org">
<select ng-change="changeCurrOrg(currentOrgSlug)" ng-model="currentOrgSlug" ng-options="organization.slug as organization.name for organization in userAdminOf"></select>
</label>
<a cv-org-href="/admin/">
<span ng-if="!user.is_multi_org">{{currentOrg.name}} - </span>Admin
</a>
<div class="mx1 float-right">
<a cv-org-href="/">Exit Admin</a>
</div>
</div>
</nav>
<nav class="my4 col col-sm-3" ng-show="nav == 'admin'">
<ul class="CoreNav">
<li>
<a class="NavItem" cv-org-href="/admin/">Organization</a>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/people/">People</a>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/databases">Databases</a>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/datasets">Datasets</a>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/emailreport/">Email Reports</a>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/query/run/">Query</a>
<ul class="ContextNav">
<li>
<a class="NavItem" cv-org-href="/admin/query/run">Run Query</a>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/query/">Saved Queries</a>
</li>
</ul>
</li>
<li>
<a class="NavItem" cv-org-href="/admin/search">Search</a>
</li>
<li ng-if="user.is_superuser">
<a class="NavItem" cv-org-href="/admin/settings">Settings</a>
</li>
</ul>
<section class="wrapper">
<a class="NavItem" cv-org-href="/admin/people/">People</a>
<a class="NavItem" cv-org-href="/admin/databases">Databases</a>
<a class="NavItem" cv-org-href="/admin/datasets">Datasets</a>
<a class="NavItem" cv-org-href="/admin/emailreport/">Email Reports</a>
<a class="NavItem" cv-org-href="/admin/query/run">Run Query</a>
<a class="NavItem" cv-org-href="/admin/query/">Saved Queries</a>
<a class="NavItem" cv-org-href="/admin/search">Search</a>
<a class="NavItem" cv-org-href="/admin/settings">Settings</a>
</section>
</nav>
<nav ng-show="nav == 'superadmin'">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment