hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

Browse Source 
# Conflicts:
#	.bowerrc
This commit is contained in:
Mike Ng
2018-01-08 16:37:46 +04:00
parent a853ec7d8d
commit a08a55b58e
9 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Admin/SetupController.php
View File

@@ -38,12 +38,10 @@ class SetupController extends Controller
public function submitGlobalsAction(Request $request) public function submitGlobalsAction(Request $request)
{ {
if (null !== $this->configuration->get('registry')) if (null !== $this->configuration->get('registry')) {
{
$form = $this->registryFormManipulator->createForm($this->configuration); $form = $this->registryFormManipulator->createForm($this->configuration);
} }
else else {
{
$form = $this->registryFormManipulator->createForm(); $form = $this->registryFormManipulator->createForm();
} }

4
lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php
View File

@@ -7,9 +7,12 @@
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Alchemy\Phrasea\Form\Configuration; namespace Alchemy\Phrasea\Form\Configuration;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
class CustomLinkFormType extends AbstractType class CustomLinkFormType extends AbstractType
{ {
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
@@ -83,6 +86,7 @@ class CustomLinkFormType extends AbstractType
] ]
]); ]);
} }
public function getName() public function getName()
{ {
return null; return null;

3
resources/gulp/build.js
View File

@@ -50,4 +50,5 @@ gulp.task('build-vendors', [
'build-jquery-lazyload', 'build-jquery-lazyload',
'build-jquery-test-paths', 'build-jquery-test-paths',
'build-simple-colorpicker' 'build-simple-colorpicker'
], function() {}); ], function () {
});

2
templates/web/admin/setup.html.twig
View File

@@ -157,6 +157,7 @@
updateInputNameColor($(element).parent().siblings(':first').find("input"), $(element).val()); updateInputNameColor($(element).parent().siblings(':first').find("input"), $(element).val());
}); });
} }
$("#custom-link-table").on('click', '.close-row', function () { $("#custom-link-table").on('click', '.close-row', function () {
$(this).closest('tr').remove(); $(this).closest('tr').remove();
var rowCount = $('#custom-link-table tr').length; var rowCount = $('#custom-link-table tr').length;
@@ -179,6 +180,7 @@
element.css("background", color); element.css("background", color);
} }
} }
function updateInputNameColor(element, color) { function updateInputNameColor(element, color) {
element.css("background-color", color); element.css("background-color", color);
if (color === "") { if (color === "") {

3
templates/web/common/index_bootstrap.html.twig
View File

@@ -25,7 +25,8 @@
<script type="text/javascript"> <script type="text/javascript">
google.charts.load('42', {packages: ['corechart']}); google.charts.load('42', {packages: ['corechart']});
</script> </script>
<script type="text/javascript" src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript"
src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
{% block rss %}{% endblock %} {% block rss %}{% endblock %}
{% block javascript %}{% endblock %} {% block javascript %}{% endblock %}
</head> </head>