Skip to content

P
Platform
Unverified Commit 34fee80f authored by Nicolas Widart's avatar Nicolas Widart
Browse files
Options

Update button styles to use element-ui style

parent cb768834
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 116 deletions
Modules/Core/Assets/js/components/DeleteComponent.vue
View file @ 34fee80f
<template> <template>
<button class="btn btn-danger btn-flat" @click="deleteRow"><i class="fa fa-trash"></i></button> <el-button type="danger" @click="deleteRow" size="small"><i class="fa fa-trash"></i></el-button>
</template> </template>
<script> <script>
......
Modules/Media/Assets/js/components/MediaList.vue
View file @ 34fee80f
...@@ -81,20 +81,27 @@ ...@@ -81,20 +81,27 @@
<el-table-column prop="actions" label="" width="150"> <el-table-column prop="actions" label="" width="150">
<template scope="scope"> <template scope="scope">
<div class="pull-right"> <div class="pull-right">
<a class="btn btn-primary btn-flat" @click.prevent="insertMedia(scope)" <el-button
v-if="singleModal && ! scope.row.is_folder"> type="primary"
size="small"
@click.prevent="insertMedia(scope)"
v-if="singleModal && ! scope.row.is_folder">
{{ trans('media.insert') }} {{ trans('media.insert') }}
</a> </el-button>
<div v-if="! singleModal"> <div v-if="! singleModal">
<a class="btn btn-default btn-flat" @click.prevent="loadEditForm(scope)" <el-button-group>
v-if="! scope.row.is_folder"><i class="fa fa-pencil"></i></a> <el-button
size="small"
<a @click.prevent="showEditFolder(scope.row)" class="btn btn-default btn-flat" @click.prevent="loadEditForm(scope)"
v-if="scope.row.is_folder && canEditFolders"> v-if="! scope.row.is_folder"><i class="fa fa-pencil"></i></el-button>
<i class="fa fa-pencil"></i> <el-button
</a> size="small"
@click.prevent="showEditFolder(scope.row)"
<delete-button :scope="scope" :rows="data"></delete-button> v-if="scope.row.is_folder && canEditFolders">
<i class="fa fa-pencil"></i>
</el-button>
<delete-button :scope="scope" :rows="data"></delete-button>
</el-button-group>
</div> </div>
</div> </div>
</template> </template>
......
Modules/Page/Assets/js/components/PageTableServerSide.vue
View file @ 34fee80f
...@@ -67,11 +67,14 @@ ...@@ -67,11 +67,14 @@
</el-table-column> </el-table-column>
<el-table-column fixed="right" prop="actions" :label="trans('core.table.actions')"> <el-table-column fixed="right" prop="actions" :label="trans('core.table.actions')">
<template scope="scope"> <template scope="scope">
<a class="btn btn-default btn-flat" @click.prevent="goToEdit(scope)"><i <el-button-group>
class="fa fa-pencil"></i></a> <el-button
size="small"
@click.prevent="goToEdit(scope)"
v-if="! scope.row.is_folder"><i class="fa fa-pencil"></i></el-button>
<delete-button :scope="scope" :rows="data"> <delete-button :scope="scope" :rows="data"></delete-button>
</delete-button> </el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
public/js/app.js
View file @ 34fee80f
...@@ -91820,6 +91820,9 @@ var _data = void 0; // ...@@ -91820,6 +91820,9 @@ var _data = void 0; //
// //
// //
// //
//
//
//
exports.default = { exports.default = {
mixins: [_ShortcutHelper2.default], mixins: [_ShortcutHelper2.default],
...@@ -92201,22 +92204,34 @@ var render = function() { ...@@ -92201,22 +92204,34 @@ var render = function() {
fn: function(scope) { fn: function(scope) {
return [ return [
_c( _c(
"a", "el-button-group",
{ [
staticClass: "btn btn-default btn-flat", !scope.row.is_folder
on: { ? _c(
click: function($event) { "el-button",
$event.preventDefault() {
_vm.goToEdit(scope) attrs: { size: "small" },
} on: {
} click: function($event) {
}, $event.preventDefault()
[_c("i", { staticClass: "fa fa-pencil" })] _vm.goToEdit(scope)
), }
_vm._v(" "), }
_c("delete-button", { },
attrs: { scope: scope, rows: _vm.data } [
}) _c("i", {
staticClass: "fa fa-pencil"
})
]
)
: _vm._e(),
_vm._v(" "),
_c("delete-button", {
attrs: { scope: scope, rows: _vm.data }
})
],
1
)
] ]
} }
} }
...@@ -93999,6 +94014,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de ...@@ -93999,6 +94014,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
// //
// //
// //
//
//
//
//
//
//
//
exports.default = { exports.default = {
components: { components: {
...@@ -95322,89 +95344,111 @@ var render = function() { ...@@ -95322,89 +95344,111 @@ var render = function() {
key: "default", key: "default",
fn: function(scope) { fn: function(scope) {
return [ return [
_c("div", { staticClass: "pull-right" }, [ _c(
_vm.singleModal && !scope.row.is_folder "div",
? _c( { staticClass: "pull-right" },
"a", [
{ _vm.singleModal && !scope.row.is_folder
staticClass: "btn btn-primary btn-flat", ? _c(
on: { "el-button",
click: function($event) { {
$event.preventDefault()
_vm.insertMedia(scope)
}
}
},
[
_vm._v(
"\n " +
_vm._s(_vm.trans("media.insert")) +
"\n "
)
]
)
: _vm._e(),
_vm._v(" "),
!_vm.singleModal
? _c(
"div",
[
!scope.row.is_folder
? _c(
"a",
{
staticClass:
"btn btn-default btn-flat",
on: {
click: function($event) {
$event.preventDefault()
_vm.loadEditForm(scope)
}
}
},
[
_c("i", {
staticClass: "fa fa-pencil"
})
]
)
: _vm._e(),
_vm._v(" "),
scope.row.is_folder &&
_vm.canEditFolders
? _c(
"a",
{
staticClass:
"btn btn-default btn-flat",
on: {
click: function($event) {
$event.preventDefault()
_vm.showEditFolder(
scope.row
)
}
}
},
[
_c("i", {
staticClass: "fa fa-pencil"
})
]
)
: _vm._e(),
_vm._v(" "),
_c("delete-button", {
attrs: { attrs: {
scope: scope, type: "primary",
rows: _vm.data size: "small"
},
on: {
click: function($event) {
$event.preventDefault()
_vm.insertMedia(scope)
}
} }
}) },
], [
1 _vm._v(
) "\n " +
: _vm._e() _vm._s(
]) _vm.trans("media.insert")
) +
"\n "
)
]
)
: _vm._e(),
_vm._v(" "),
!_vm.singleModal
? _c(
"div",
[
_c(
"el-button-group",
[
!scope.row.is_folder
? _c(
"el-button",
{
attrs: { size: "small" },
on: {
click: function(
$event
) {
$event.preventDefault()
_vm.loadEditForm(
scope
)
}
}
},
[
_c("i", {
staticClass:
"fa fa-pencil"
})
]
)
: _vm._e(),
_vm._v(" "),
scope.row.is_folder &&
_vm.canEditFolders
? _c(
"el-button",
{
attrs: { size: "small" },
on: {
click: function(
$event
) {
$event.preventDefault()
_vm.showEditFolder(
scope.row
)
}
}
},
[
_c("i", {
staticClass:
"fa fa-pencil"
})
]
)
: _vm._e(),
_vm._v(" "),
_c("delete-button", {
attrs: {
scope: scope,
rows: _vm.data
}
})
],
1
)
],
1
)
: _vm._e()
],
1
)
] ]
} }
} }
...@@ -96590,8 +96634,8 @@ var render = function() { ...@@ -96590,8 +96634,8 @@ var render = function() {
var _h = _vm.$createElement var _h = _vm.$createElement
var _c = _vm._self._c || _h var _c = _vm._self._c || _h
return _c( return _c(
"button", "el-button",
{ staticClass: "btn btn-danger btn-flat", on: { click: _vm.deleteRow } }, { attrs: { type: "danger", size: "small" }, on: { click: _vm.deleteRow } },
[_c("i", { staticClass: "fa fa-trash" })] [_c("i", { staticClass: "fa fa-trash" })]
) )
} }
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

Technounit-GROUP 2023