- added some cosmetic arround the bookmarklet button in the tab bar. …

…fix twitter bootstrap broken submodule after previous merge

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "web/bootstrap"]
-	path = web/bootstrap
-	url = git://github.com/twitter/bootstrap.git
 [submodule "vendor/Twig"]
 	path = vendor/Twig
 	url = http://github.com/fabpot/Twig.git
@@ -22,3 +19,6 @@
 [submodule "vendor/Symfony/Component/Translation"]
 	path = vendor/Symfony/Component/Translation
 	url = git://github.com/symfony/Translation.git
+[submodule "web/bootstrap"]
+	path = web/bootstrap
+	url = git://github.com/twitter/bootstrap.git

src/Resources/translations/translations.php

@@ -27,6 +27,7 @@
         'closes'        => 'Closed issues',
         'github_issues' => 'Balloon Github Issues',
         'please_login'  => 'Please Login',
+        'help_bookmarklet' => "Please, drag and drop this link to your browser favorites tab bar above to enable the Balloon Github Issues Bookmarklet on all the websites you visit.",
     ),
     'fr' => array(
         'username'      => 'Identifiant',
@@ -54,5 +55,6 @@
         'closes'        => 'Issues résolues',
         'github_issues' => 'Balloon Github Issues',
         'please_login'  => 'Veuilez vous identifier',
+        'help_bookmarklet' => "Veuillez glisser le lien dans la barre de favoris de notre navigateur afin de pouvoir utilise le Bookmarklet sur les sites que vous visitez.",
     ),
 );

src/Resources/views/layout_expanded.html.twig

@@ -53,6 +53,20 @@
         <script src="{{ app.request.baseUrl | replace({'/index.php': ''}) }}/js/ux.js"></script>
         <script src="{{ app.request.baseUrl | replace({'/index.php': ''}) }}/bootstrap/js/bootstrap-modal.js"></script>
         <script src="{{ app.request.baseUrl | replace({'/index.php': ''}) }}/bootstrap/js/bootstrap-dropdown.js"></script>
+        <script src="{{ app.request.baseUrl | replace({'/index.php': ''}) }}/bootstrap/js/bootstrap-twipsy.js"></script>
+        <script src="{{ app.request.baseUrl | replace({'/index.php': ''}) }}/bootstrap/js/bootstrap-popover.js"></script>
+        <script>
+             $(function () {
+                 $("a[rel=popover]")
+                    .popover({
+                       offset: 5,
+                       placement: 'below'
+                     })
+                    .click(function(e) {
+                       e.preventDefault()
+                    })
+            });
+        </script>
     {% endblock %}
 </body>
 </html>

src/Resources/views/topbar.html.twig

@@ -6,7 +6,7 @@
           {% if bookmarklet is not defined %}
             <ul>
                 <li>
-                    <a href="javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('id','balloon_github_issues_bookmarklet');e.setAttribute('class', '{{ app['config']['base_url'] }}');e.setAttribute('src','{{ app['config']['base_url']}}/js/init_bookmarklet.js');document.body.appendChild(e);})());">Bookmarklet </a>
+                    <a id="bookmarklet" href="javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('id','balloon_github_issues_bookmarklet');e.setAttribute('class', '{{ app['config']['base_url'] }}');e.setAttribute('src','{{ app['config']['base_url']}}/js/init_bookmarklet.js');document.body.appendChild(e);})());" rel="popover" data-content="{{ 'help_bookmarklet' | trans }}" data-original-title="{{ 'github_issues' | trans }} Bookmarklet">Bookmarklet</a>
                     </li>
             </ul>
           {% endif %}

web/css/style.css

@@ -50,6 +50,10 @@ body {
   border-left: 1px solid #eee;
 }
 
+.topbar {
+    z-index: 8888;
+}
+
 .topbar .btn {
   border: 0;
 }
@@ -222,3 +226,15 @@ small {
     overflow: hidden;
 }
 
+.popover {
+    z-index: 9999;
+}
+
+.popover .inner {
+    width: 350px !important;
+}
+
+.popover .content {
+    margin: 0;
+    padding: 5px;
+}