jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2026-05-09 12:01:08 -04:00
Code Issues Projects Releases Wiki Activity

Dynamic forms back live again, extra classes added for better form design

Browse Source
This commit is contained in:
Zsolt Kocsmarszky
2017-12-27 11:19:19 +01:00
parent 3bc5c60907
commit e6ec50a4e6
3 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/components/dynamic-form.html
View File

@@ -23,7 +23,7 @@
ng-if="field.property.type === 'file'">
</div>
<button class="btn btn-primary" ng-disabled="!dataSourceForm.$valid" ng-click="saveChanges()">Save</button>
<button class="btn btn-block btn-primary m-b-10" ng-disabled="!dataSourceForm.$valid" ng-click="saveChanges()">Save</button>
<span ng-repeat="action in actions">
<button class="btn"
ng-class="action.class"

55
client/app/pages/data-sources/show.html
View File

@@ -154,60 +154,9 @@
</div>
<div class="col-md-4 col-md-offset-4">
<form class="form ng-pristine ng-valid-email ng-valid ng-valid-required" name="userSettingsForm" ng-submit="updateUser(userSettingsForm)" novalidate="">
<div class="form-group" ng-class="{ 'has-error': (userSettingsForm.name | showError:userSettingsForm )}">
<label class="control-label" for="name">Name</label>
<input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
<error-messages input="userSettingsForm.name" form="userSettingsForm">
<div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
</div>
</error-messages>
</div>
<div class="form-group" ng-class="{ 'has-error': (userSettingsForm.name | showError:userSettingsForm )}">
<label class="control-label" for="name">Project ID</label>
<input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
<error-messages input="userSettingsForm.name" form="userSettingsForm">
<div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
</div>
</error-messages>
</div>
<div class="form-group" ng-class="{ 'has-error': (userSettingsForm.name | showError:userSettingsForm )}">
<label class="control-label" for="name">Scanned</label>
<input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
<error-messages input="userSettingsForm.name" form="userSettingsForm">
<div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
</div>
</error-messages>
</div>
<div class="form-group" ng-class="{ 'has-error': (userSettingsForm.name | showError:userSettingsForm )}">
<label class="control-label" for="name">Maximum</label>
<input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
<error-messages input="userSettingsForm.name" form="userSettingsForm">
<div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
</div>
</error-messages>
</div>
<div class="form-group">
<button class="btn btn-block btn-primary">Add Data Source</button>
</div>
<div class="form-group ">
<button class="btn btn-danger">Delete</button>
<button class="btn btn-primary pull-right">Test Connection</button>
</div>
</form>
<dynamic-form target="dataSource" type="data_sources" actions="actions">
</dynamic-form>
</div>
<!--<div class="col-md-8">-->
<!--<dynamic-form target="dataSource" type="data_sources" actions="actions">-->
<!--</dynamic-form>-->
<!--</div>-->
</div>
</settings-screen>

2
client/app/pages/data-sources/show.js
View File

@@ -55,7 +55,7 @@ function DataSourceCtrl(
$scope.actions = [
{ name: 'Delete', class: 'btn-danger', callback: deleteDataSource },
{
name: 'Test Connection', class: 'btn-default', callback: testConnection, disableWhenDirty: true,
name: 'Test Connection', class: 'btn-default pull-right', callback: testConnection, disableWhenDirty: true,
},
];
}