Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 754ee6a
Merge: b0c478b bb7c9c5
Author: Juhani Aronen <[email protected]>
Date:   Fri Oct 21 21:43:06 2022 +0300

    Merge pull request #2 from zunnu/3.x-dev

    Error handling for association registration

commit bb7c9c5
Author: Juhani Aronen <[email protected]>
Date:   Fri Oct 21 21:41:34 2022 +0300

    Error handling for association registeration

commit b0c478b
Merge: 5f0b683 2369126
Author: Juhani Aronen <[email protected]>
Date:   Wed Oct 19 20:42:20 2022 +0300

    Merge pull request #1 from zunnu/3.x-dev

    Functionality improvements

commit 2369126
Author: Juhani Aronen <[email protected]>
Date:   Wed Oct 19 16:58:47 2022 +0300

    Added model search

commit a5fbda8
Author: Juhani Aronen <[email protected]>
Date:   Tue Oct 18 21:36:45 2022 +0300

    Added comments to the code, cleaned code

commit a293e60
Author: Juhani Aronen <[email protected]>
Date:   Tue Oct 18 17:58:08 2022 +0300

    Added deep children option, improved drawing, added moving from one model to another
  • Loading branch information
zunnu committed Oct 21, 2022
1 parent ab59046 commit f1d6c41
Show file tree
Hide file tree
Showing 3 changed files with 454 additions and 150 deletions.
53 changes: 53 additions & 0 deletions tests/TestCase/View/Helper/StructureBuilderHelperTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php
namespace AssociationsDebugger\Test\TestCase\View\Helper;

use AssociationsDebugger\View\Helper\StructureBuilderHelper;
use Cake\TestSuite\TestCase;
use Cake\View\View;

/**
* AssociationsDebugger\View\Helper\StructureBuilderHelper Test Case
*/
class StructureBuilderHelperTest extends TestCase
{
/**
* Test subject
*
* @var \AssociationsDebugger\View\Helper\StructureBuilderHelper
*/
public $StructureBuilder;

/**
* setUp method
*
* @return void
*/
public function setUp()
{
parent::setUp();
$view = new View();
$this->StructureBuilder = new StructureBuilderHelper($view);
}

/**
* tearDown method
*
* @return void
*/
public function tearDown()
{
unset($this->StructureBuilder);

parent::tearDown();
}

/**
* Test initial setup
*
* @return void
*/
public function testInitialization()
{
$this->markTestIncomplete('Not implemented yet.');
}
}
32 changes: 28 additions & 4 deletions webroot/css/bootstrap-multiselect.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Bootstrap Multiselect (http:https://davidstutz.de/bootstrap-multiselect/)
*
* Apache License, Version 2.0:
* Copyright (c) 2012 - 2020 David Stutz
* Copyright (c) 2012 - 2022 David Stutz
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a
Expand All @@ -15,7 +15,7 @@
* under the License.
*
* BSD 3-Clause License:
* Copyright (c) 2012 - 2020 David Stutz
* Copyright (c) 2012 - 2022 David Stutz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -59,6 +59,10 @@ span.multiselect-native-select select {
.multiselect.dropdown-toggle:after {
display: none;
}
.multiselect {
overflow: hidden;
text-overflow: ellipsis;
}
.multiselect-container {
position: absolute;
list-style-type: none;
Expand Down Expand Up @@ -88,8 +92,20 @@ span.multiselect-native-select select {
margin-left: -1.5rem;
display: none;
}
.multiselect-container .multiselect-option.multiselect-group-option-indented-full {
padding-left: 2.6rem;
}
.multiselect-container .multiselect-option.multiselect-group-option-indented {
padding-left: 1.75rem;
padding-left: 1.8rem;
}
.multiselect-container .multiselect-group {
cursor: pointer;
}
.multiselect-container .multiselect-group.closed .dropdown-toggle::after {
transform: rotate(-90deg);
}
.multiselect-container .multiselect-group .caret-container ~ .form-check {
margin-left: 0.5rem;
}
.multiselect-container .multiselect-option,
.multiselect-container .multiselect-group,
Expand Down Expand Up @@ -118,6 +134,14 @@ span.multiselect-native-select select {
background-color: lightgrey;
color: black;
}
.multiselect-container .multiselect-option:hover,
.multiselect-container .multiselect-group:hover,
.multiselect-container .multiselect-all:hover,
.multiselect-container .multiselect-option:focus,
.multiselect-container .multiselect-group:focus,
.multiselect-container .multiselect-all:focus {
background-color: darkgray !important;
}
.multiselect-container .multiselect-option .form-check,
.multiselect-container .multiselect-group .form-check,
.multiselect-container .multiselect-all .form-check {
Expand Down Expand Up @@ -152,4 +176,4 @@ span.multiselect-native-select select {
.input-group > .multiselect-native-select:not(:last-child) .multiselect {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}
Loading

0 comments on commit f1d6c41

Please sign in to comment.