summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Coevoet <stof@notk.org>2012-05-19 00:52:50 +0200
committerChristophe Coevoet <stof@notk.org>2012-05-19 00:52:50 +0200
commit4d8338cfc918f34bd803f6f504006161a269273d (patch)
treee1017ef0e43156c44215965dc2e6eee67b7d2801
parent90d91253a31d0bf7f952c6d79bff57355ca98671 (diff)
Updated to the new SonataAdminBundle CSS and fixed some JS errors
-rw-r--r--app/Resources/views/user_block.html.twig2
-rw-r--r--src/Tolkiendil/GameBundle/Resources/public/css/admin.css8
-rw-r--r--src/Tolkiendil/GameBundle/Resources/public/js/wordSearch.js6
3 files changed, 10 insertions, 6 deletions
diff --git a/app/Resources/views/user_block.html.twig b/app/Resources/views/user_block.html.twig
index 8700820..78370a1 100644
--- a/app/Resources/views/user_block.html.twig
+++ b/app/Resources/views/user_block.html.twig
@@ -1 +1 @@
-{% if app.user is not empty %}<a href="#">Hello {{ app.user.username }}</a>{% endif %}
+{% if app.user is not empty %}Hello {{ app.user.username }}{% endif %}
diff --git a/src/Tolkiendil/GameBundle/Resources/public/css/admin.css b/src/Tolkiendil/GameBundle/Resources/public/css/admin.css
index c53cf9f..31ebe1b 100644
--- a/src/Tolkiendil/GameBundle/Resources/public/css/admin.css
+++ b/src/Tolkiendil/GameBundle/Resources/public/css/admin.css
@@ -1,4 +1,8 @@
-div.letter_grid .clearfix {
+.letter_grid .sonata-collection-add, .word_collection .sonata-collection-add {
+ display: none;
+}
+
+.form-horizontal div.letter_grid .control-group {
margin-bottom: 2px;
margin-left: 2px;
}
@@ -16,7 +20,7 @@ div.letter_grid .clearfix {
display: inline-block;
}
-div.letter_collection .input {
+.form-horizontal div.letter_collection .controls {
margin-left: 0;
}
diff --git a/src/Tolkiendil/GameBundle/Resources/public/js/wordSearch.js b/src/Tolkiendil/GameBundle/Resources/public/js/wordSearch.js
index e935cb8..1a7900c 100644
--- a/src/Tolkiendil/GameBundle/Resources/public/js/wordSearch.js
+++ b/src/Tolkiendil/GameBundle/Resources/public/js/wordSearch.js
@@ -101,7 +101,7 @@
myTmpLink.attr({
href: '#',
id: upAndReplace(data.words[mm]),
- className: 'word',
+ 'class': 'word',
name: data.words[mm]
});
myTmpLink.css('visibility', 'hidden');
@@ -133,7 +133,7 @@
data.txtWord = $('<td>');
data.selWord = $('<td>').append('&nbsp;');
data.selValidate = $('<img>').attr('src', getImageUrl(data.urlSite, 'nok'));
- selValidate = $('<td>').attr({className: 'validate', rowspan: 2}).append(data.selValidate);
+ selValidate = $('<td>').attr({'class': 'validate', rowspan: 2}).append(data.selValidate);
data.selDir = $('<td>').append('&nbsp;');
data.txtDir = $('<td>');
myTmpRow = $('<tr>');
@@ -159,7 +159,7 @@
myTmpRow = undefined;
}
- return $('<td>').attr({className: 'rt', 'colspan': 2}).append(myTmpTable);
+ return $('<td>').attr({'class': 'rt', 'colspan': 2}).append(myTmpTable);
}
function setDir(self, dir) {