Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/microweber/microweber into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
bobimicroweber committed Mar 15, 2022
2 parents 5b63a71 + 5f3076f commit 47b2caf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions userfiles/modules/content/views/manager.php
Expand Up @@ -139,6 +139,7 @@
mw.reload_module_parent('posts');
mw.reload_module_parent('content');
mw.reload_module_parent('shop/products');
mw.notification.success('<?php _e("All changes are saved"); ?>.');
});
},
start: function (a, ui) {
Expand Down
6 changes: 3 additions & 3 deletions userfiles/modules/content/views/toolbar.php
Expand Up @@ -367,7 +367,7 @@ class="<?php print $class; ?>"></span> <span> <?php print $title; ?> </span>
<?php if (!isset($edit_page_info)): ?>
<div class="card-body pt-3 pb-0">
<div class="toolbar row js-hide-when-no-items">
<div class="col-sm-6 d-md-flex d-none align-items-center justify-content-center justify-content-sm-start my-1">
<div class="col-sm-4 d-md-flex d-none align-items-center justify-content-center justify-content-sm-start my-1">
<div class="custom-control custom-checkbox mb-0">
<input type="checkbox" class="custom-control-input " id="posts-check">
<label class="custom-control-label" for="posts-check"><?php _e('Check all'); ?></label>
Expand Down Expand Up @@ -430,13 +430,13 @@ class="<?php print $class; ?>"></span> <span> <?php print $title; ?> </span>
}
?>

<div class="js-table-sorting col-sm-6 text-end text-right my-1 d-flex justify-content-center justify-content-sm-end align-items-center">
<div class="js-table-sorting col-sm-8 text-end text-right my-1 d-flex justify-content-center justify-content-sm-end align-items-center">


<span class="d-md-block d-none"><?php _e("Limit"); ?>:</span>

<div class="d-inline-block mx-1">
<select class="form-control form-control-sm" onclick="postsLimit({id:'pages_edit_container_content_list', el:this});">
<select class="form-control form-control-sm" onchange="postsLimit({id:'pages_edit_container_content_list', el:this});">
<option value="10" <?php if(isset($params['limit']) && $params['limit']==10): ?>selected="selected"<?php endif; ?>>10</option>
<option value="25" <?php if(isset($params['limit']) && $params['limit']==25): ?>selected="selected"<?php endif; ?>>25</option>
<option value="50" <?php if(isset($params['limit']) && $params['limit']==50): ?>selected="selected"<?php endif; ?>>50</option>
Expand Down

0 comments on commit 47b2caf

Please sign in to comment.