Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FriendsOfCake/crud-view
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.50.0
Choose a base ref
...
head repository: FriendsOfCake/crud-view
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.50.1
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 18, 2024

  1. Sync style for empty select option with input placeholder text

    ADmad committed Sep 18, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    smiasojed Sebastian Miasojed
    Copy the full SHA
    a728097 View commit details

Commits on Oct 2, 2024

  1. Update readthedocs config

    ADmad committed Oct 2, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    smiasojed Sebastian Miasojed
    Copy the full SHA
    b434841 View commit details
  2. update python version

    ADmad committed Oct 2, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    smiasojed Sebastian Miasojed
    Copy the full SHA
    d278816 View commit details
  3. Simplify docs/requirements.txt

    ADmad committed Oct 2, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    smiasojed Sebastian Miasojed
    Copy the full SHA
    ff5f8ee View commit details

Commits on Nov 23, 2024

  1. Fix JS error

    ADmad committed Nov 23, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    smiasojed Sebastian Miasojed
    Copy the full SHA
    eeda797 View commit details
  2. Merge pull request #341 from FriendsOfCake/js-error

    Fix JS error
    ADmad authored Nov 23, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    smiasojed Sebastian Miasojed
    Copy the full SHA
    848c020 View commit details
Showing with 42 additions and 50 deletions.
  1. +29 −2 .readthedocs.yaml
  2. +3 −3 config/asset_compress.ini
  3. +5 −27 docs/requirements.txt
  4. +1 −2 webroot/css/local.css
  5. +4 −16 webroot/js/local.js
31 changes: 29 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,35 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.9"
# You can also specify other tool versions:
# nodejs: "20"
# rust: "1.70"
# golang: "1.20"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/conf.py
formats: all
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
# builder: "dirhtml"
# Fail on all warnings to avoid broken references
# fail_on_warning: true

# Optionally build your docs in additional formats such as PDF and ePub
formats:
- pdf
- epub

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
version: 3.7
install:
- requirements: docs/requirements.txt
6 changes: 3 additions & 3 deletions config/asset_compress.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[crudview.css]
files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/css/bootstrap.min.css
files[]=https://cdn.jsdelivr.net/npm/flatpickr@4.6/dist/flatpickr.min.css
files[]=https://cdn.jsdelivr.net/npm/select2@4.0/dist/css/select2.min.css
files[]=https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css
files[]=https://cdn.jsdelivr.net/npm/select2-bootstrap-5-theme@1.3/dist/select2-bootstrap-5-theme.min.css
files[]=plugin:CrudView:css/local.css

[crudview_head.js]
files[]=https://cdn.jsdelivr.net/npm/jquery@3.7/dist/jquery.min.js
files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/js/bootstrap.min.js
files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/js/bootstrap.bundle.min.js
files[]=https://cdn.jsdelivr.net/npm/flatpickr@4.6
files[]=https://cdn.jsdelivr.net/npm/select2@4.0
files[]=https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js
files[]=https://cdn.jsdelivr.net/npm/jquery.dirtyforms@2.0/jquery.dirtyforms.min.js

[crudview.js]
32 changes: 5 additions & 27 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
alabaster==0.7.12
Babel==2.9.1
cakephp-theme==1.1.3
certifi==2024.7.4
chardet==3.0.4
docutils==0.15.2
idna==2.8
imagesize==1.1.0
Jinja2==2.11.3
MarkupSafe==1.1.1
packaging==19.2
Pygments==2.15.0
pyparsing==2.4.5
pytz==2019.3
requests==2.32.2
six==1.13.0
snowballstemmer==2.0.0
Sphinx==2.2.1
sphinx-rtd-theme==0.4.3
sphinxcontrib-applehelp==1.0.1
sphinxcontrib-devhelp==1.0.1
sphinxcontrib-htmlhelp==1.0.2
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-phpdomain==0.6.2
sphinxcontrib-qthelp==1.0.2
sphinxcontrib-serializinghtml==1.1.3
urllib3==1.26.19
Pygments==2.18.0
Sphinx==7.4.7
sphinx-rtd-theme==2.0.0
sphinxcontrib-phpdomain==0.12.0
cakephp-theme
3 changes: 1 addition & 2 deletions webroot/css/local.css
Original file line number Diff line number Diff line change
@@ -60,8 +60,7 @@ h2 .actions {
.search-filters .form-inline select:invalid,
.search-filters .form-inline select:has(option[value=""]:checked),
.search-filters .form-inline option[value=""] {
font-style: italic;
color: #777;
color: var(--bs-secondary-color);
}

.search-filters .form-inline select.autocomplete {
20 changes: 4 additions & 16 deletions webroot/js/local.js
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ var CrudView = {
select2: function (selector) {
$(selector).each(function () {
var $this = $(this),
config = {theme: 'bootstrap4'};
config = {theme: 'bootstrap-5'};

if (!$this.prop('multiple') && $this.find('option:first').val() === '') {
config.allowClear = true;
@@ -36,7 +36,7 @@ var CrudView = {
var $ele = $(ele);

$ele.select2({
theme: 'bootstrap4',
theme: 'bootstrap-5',
minimumInputLength: 1,
ajax: {
delay: 250,
@@ -82,20 +82,9 @@ var CrudView = {
$('form[data-dirty-check=1]').dirtyForms();
},

dropdown: function () {
$('.dropdown-toggle').dropdown();

// recommended hack to get dropdowns correctly work inside responsive table
$('.table-responsive').on('show.bs.dropdown', function () {
$('.table-responsive').css( "overflow", "inherit" );
});
$('.table-responsive').on('hide.bs.dropdown', function () {
$('.table-responsive').css( "overflow", "auto" );
})
},

tooltip: function () {
$('[data-toggle="tooltip"]').tooltip();
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
},

initialize: function () {
@@ -104,7 +93,6 @@ var CrudView = {
this.select2('select[multiple]:not(.no-select2), select.select2');
this.autocomplete('input.autocomplete, select.autocomplete');
this.dirtyForms();
this.dropdown();
this.tooltip();
}
};