Skip to content

U
ulakbus-ui
Commit b5cb0d0d authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

Merge branch 'Feature/issue21'

parents a195d0bc d5328b2b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 83 deletions
app/components/crud/crud_controller.js
View file @ b5cb0d0d
......@@ -39,7 +39,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
}
});
scope.form_params = {
cmd: cmd,
//cmd: cmd,
model: routeParams.model,
param: scope.param || routeParams.param,
id: scope.param_id || routeParams.param_id,
......
app/shared/templates/foreignKey.html
View file @ b5cb0d0d
<div class="form-group {{form.htmlClass}} schema-form-select col-md-12"
ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false}">
<div class="col-md-8">
<div class="col-md-12">
<label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()">
{{form.title}}
</label>
<a><i class="fa fa-plus-circle fa-fw" add-modal-for-linked-model="{{form.formName}}"></i></a>
<div class="form-group input-group">
<span class="input-group-btn">
......@@ -43,9 +44,4 @@
<div class="help-block" sf-message="form.description"></div>
</div>
<div class="col-md-4">
<a href="javascript:void(0);" add-modal-for-linked-model>
<i class="fa fa-plus-circle fa-fw"></i>
</a>
</div>
</div>
\ No newline at end of file
app/shared/templates/multiselect.html
View file @ b5cb0d0d
<div class="form-group {{form.htmlClass}} schema-form-select col-md-12"
ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false}">
<div class="col-md-8">
<div class="col-md-12">
<label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()">
{{form.title}}
</label>
<a><i class="fa fa-plus-circle fa-fw" add-modal-for-linked-model="{{form.formName}}"></i></a>
<div class="row">
<div class="form-group input-group">
<div class="col-md-12">
<input type="text"
placeholder="{{form.title}} filtrele"
class="form-control {{form.fieldHtmlClass}}"
name="filter-interface"
ng-model="form.filterValue"
ng-keyup="form.appendFiltered(form.filterValue)"
/>
ng-keyup="form.appendFiltered(form.filterValue)"/>
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="col-md-12">
<label for="filterItems">{{form.title}} Liste</label>
<select ng-model="selectedItemsModel"
value="$$value$$"
......@@ -31,13 +30,12 @@
</select>
</div>
<div class="col-md-1">
<a href="javascript:void(0)" ng-click="form.select(selectedItemsModel)"><i class="fa fa-arrow-right fa-fw"></i></a><br>
<a href="javascript:void(0)" ng-click="form.deselect(selectedFilteredItemsModel)"><i class="fa fa-arrow-left fa-fw"></i></a>
<div class="col-md-12 text-center">
<a><i class="fa fa-arrow-down fa-fw" ng-click="form.select(selectedItemsModel)"></i></a>
<a><i class="fa fa-arrow-up fa-fw" ng-click="form.deselect(selectedFilteredItemsModel)"></i></a>
</div>
<div class="col-md-5">
<div class="col-md-12">
<label for="selectedItems">Seçilenler</label>
<select ng-model="selectedFilteredItemsModel"
value="$$value$$"
......@@ -54,9 +52,9 @@
<div class="help-block" sf-message="form.description"></div>
</div>
<div class="col-md-4">
<a href="javascript:void(0);" add-modal-for-linked-model>
<i class="fa fa-plus-circle fa-fw"></i>
</a>
</div>
<!--<div class="col-md-4">-->
<!--<a href="javascript:void(0);" add-modal-for-linked-model>-->
<!--<i class="fa fa-plus-circle fa-fw"></i>-->
<!--</a>-->
<!--</div>-->
</div>
\ No newline at end of file
app/zetalib/form_service.js
View file @ b5cb0d0d
This diff is collapsed.
dist/app.js
View file @ b5cb0d0d
This diff is collapsed.
dist/bower_components/components.js
View file @ b5cb0d0d
This diff is collapsed.
dist/templates.js
View file @ b5cb0d0d
......@@ -1462,10 +1462,11 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu
$templateCache.put("shared/templates/foreignKey.html",
"<div class=\"form-group {{form.htmlClass}} schema-form-select col-md-12\"\n" +
" ng-class=\"{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false}\">\n" +
" <div class=\"col-md-8\">\n" +
" <div class=\"col-md-12\">\n" +
" <label class=\"control-label {{form.labelHtmlClass}}\" ng-show=\"showTitle()\">\n" +
" {{form.title}}\n" +
" </label>\n" +
" <a><i class=\"fa fa-plus-circle fa-fw\" add-modal-for-linked-model=\"{{form.formName}}\"></i></a>\n" +
"\n" +
" <div class=\"form-group input-group\">\n" +
" <span class=\"input-group-btn\">\n" +
......@@ -1505,11 +1506,6 @@ angular.module("shared/templates/foreignKey.html", []).run(["$templateCache", fu
"\n" +
" <div class=\"help-block\" sf-message=\"form.description\"></div>\n" +
" </div>\n" +
" <div class=\"col-md-4\">\n" +
" <a href=\"javascript:void(0);\" add-modal-for-linked-model>\n" +
" <i class=\"fa fa-plus-circle fa-fw\"></i>\n" +
" </a>\n" +
" </div>\n" +
"</div>");
}]);
......@@ -1579,24 +1575,23 @@ angular.module("shared/templates/multiselect.html", []).run(["$templateCache", f
$templateCache.put("shared/templates/multiselect.html",
"<div class=\"form-group {{form.htmlClass}} schema-form-select col-md-12\"\n" +
" ng-class=\"{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false}\">\n" +
" <div class=\"col-md-8\">\n" +
" <div class=\"col-md-12\">\n" +
" <label class=\"control-label {{form.labelHtmlClass}}\" ng-show=\"showTitle()\">\n" +
" {{form.title}}\n" +
" </label>\n" +
" <a><i class=\"fa fa-plus-circle fa-fw\" add-modal-for-linked-model=\"{{form.formName}}\"></i></a>\n" +
"\n" +
" <div class=\"row\">\n" +
" <div class=\"form-group input-group\">\n" +
" <div class=\"col-md-12\">\n" +
" <input type=\"text\"\n" +
" placeholder=\"{{form.title}} filtrele\"\n" +
" class=\"form-control {{form.fieldHtmlClass}}\"\n" +
" name=\"filter-interface\"\n" +
" ng-model=\"form.filterValue\"\n" +
" ng-keyup=\"form.appendFiltered(form.filterValue)\"\n" +
" />\n" +
" ng-keyup=\"form.appendFiltered(form.filterValue)\"/>\n" +
" </div>\n" +
" </div>\n" +
" <div class=\"row\">\n" +
" <div class=\"col-md-5\">\n" +
"\n" +
" <div class=\"col-md-12\">\n" +
" <label for=\"filterItems\">{{form.title}} Liste</label>\n" +
" <select ng-model=\"selectedItemsModel\"\n" +
" value=\"$$value$$\"\n" +
......@@ -1610,13 +1605,12 @@ angular.module("shared/templates/multiselect.html", []).run(["$templateCache", f
" </select>\n" +
" </div>\n" +
"\n" +
"\n" +
" <div class=\"col-md-1\">\n" +
" <a href=\"javascript:void(0)\" ng-click=\"form.select(selectedItemsModel)\"><i class=\"fa fa-arrow-right fa-fw\"></i></a><br>\n" +
" <a href=\"javascript:void(0)\" ng-click=\"form.deselect(selectedFilteredItemsModel)\"><i class=\"fa fa-arrow-left fa-fw\"></i></a>\n" +
" <div class=\"col-md-12 text-center\">\n" +
" <a><i class=\"fa fa-arrow-down fa-fw\" ng-click=\"form.select(selectedItemsModel)\"></i></a>\n" +
" <a><i class=\"fa fa-arrow-up fa-fw\" ng-click=\"form.deselect(selectedFilteredItemsModel)\"></i></a>\n" +
" </div>\n" +
"\n" +
" <div class=\"col-md-5\">\n" +
" <div class=\"col-md-12\">\n" +
" <label for=\"selectedItems\">Seçilenler</label>\n" +
" <select ng-model=\"selectedFilteredItemsModel\"\n" +
" value=\"$$value$$\"\n" +
......@@ -1633,11 +1627,11 @@ angular.module("shared/templates/multiselect.html", []).run(["$templateCache", f
"\n" +
" <div class=\"help-block\" sf-message=\"form.description\"></div>\n" +
" </div>\n" +
" <div class=\"col-md-4\">\n" +
" <a href=\"javascript:void(0);\" add-modal-for-linked-model>\n" +
" <i class=\"fa fa-plus-circle fa-fw\"></i>\n" +
" </a>\n" +
" </div>\n" +
" <!--<div class=\"col-md-4\">-->\n" +
" <!--<a href=\"javascript:void(0);\" add-modal-for-linked-model>-->\n" +
" <!--<i class=\"fa fa-plus-circle fa-fw\"></i>-->\n" +
" <!--</a>-->\n" +
" <!--</div>-->\n" +
"</div>");
}]);
......
Markdown is supported
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