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