Merge remote-tracking branch 'origin/bootstrap' into bootstrap

9d7e9d46 · Weblate · 7d20e715 · 95b18aa5 · 9d7e9d46 · 9d7e9d46
Commit 9d7e9d46 authored Oct 20, 2014 by Weblate
12 changed files
--- a/TODO
+++ b/TODO
@@ -2,9 +2,7 @@ TODO list for bootstrap migration

 - revisit all custom CSS and see what should be applied
 - revisit our JS code and check what needs to be ported
- lock icon not working on translation listing
 - convert remaining pages
    - zen mode
- add datepicker
 - merge to master
    - copy javascript translations
--- a/weblate/html/base.html
+++ b/weblate/html/base.html
@@ -20,14 +20,6 @@
 {% block extra_meta %}
 {% endblock %}

-  <script type="text/javascript">
-{% if update_lock %}
-  var update_lock = true;
-{% else %}
-  var update_lock = false;
-{% endif %}
-  </script>
-
 </head>

 <body {% if LANGUAGE_BIDI %}class="dir-rtl"{% endif %}>

--- a/weblate/html/git-commit-info.html
+++ b/weblate/html/git-commit-info.html
 {% load i18n %}
-<code class="git-commit" data-toggle="tooltip" data-placement="bottom" data-title="
+<code class="git-commit html-tooltip" data-toggle="tooltip" data-placement="bottom" data-title="
 {% blocktrans with commit.revision as hash %}Commit {{ hash }}{% endblocktrans %}<br />
 {% blocktrans with commit.author_name as author and commit.authordate|date:"DATETIME_FORMAT" as date %}Authored by {{ author }} on {{ date }}{% endblocktrans %}<br />
 {{ commit.summary }}

--- a/weblate/html/list-translations.html
+++ b/weblate/html/list-translations.html
@@ -18,7 +18,7 @@
 {% with trans.get_translated_percent as percent and trans.get_fuzzy_percent as fuzzy and trans.failing_checks as checks and trans.get_non_translated as count and trans.get_failing_checks_percent as check_percent and trans.have_suggestion as suggestions %}
 <tr>
 <th><a href="{{ trans.get_absolute_url }}">{% if show_language == 1 %}{{ trans.language }}{% else %}{{ trans.subproject }}{% if show_language == 2 %} ({{ trans.language }}){% endif %}{% endif %}</a></th>
-<td>{% if trans.is_user_locked %}<span class="ui-icon ui-icon-locked tooltip">{{ trans.get_lock_display }}</span>{% endif %}</td>
+<td>{% if trans.is_user_locked %}<span class="glyphicon glyphicon-lock html-tooltip" data-placement="bottom" data-toggle="tooltip" data-title='{{ trans.get_lock_display }}'></span>{% endif %}</td>
 <td class="progress-cell">{% translation_progress trans %}</td>
 <td class="percent">{{ percent }}%</td>
 <td class="percent" title="{% blocktrans count words=trans.untranslated_words %}{{ words }} word to translate!{% plural %}{{ words }} words to translate!{% endblocktrans %}" >{{ trans.get_words_percent }}%</td>

--- a/weblate/html/meta-header.html
+++ b/weblate/html/meta-header.html
@@ -6,6 +6,7 @@
  <link rel="stylesheet" type="text/css" href="{% get_media_prefix %}bootstrap/css/bootstrap-rtl.min.css" />
 {% endif %}
  <link rel="stylesheet" type="text/css" href="{% get_media_prefix %}bootstrap/css/bootstrap-theme.min.css" />
+  <link rel="stylesheet" type="text/css" href="{% get_media_prefix %}bootstrap/css/datepicker3.css" />
  <link rel="stylesheet" type="text/css" href="{% get_media_prefix %}style-bootstrap.css" />
  <script src="{% get_media_prefix %}js/jquery-2.1.0.min.js" type="text/javascript"></script>
  <script src="{% get_media_prefix %}js/jquery.cookie.js" type="text/javascript"></script>
@@ -13,6 +14,7 @@
  <script src="{% get_media_prefix %}js/jquery.sortElements.js" type="text/javascript"></script>
  <script src="{% get_media_prefix %}js/mousetrap.min.js" type="text/javascript"></script>
  <script src="{% get_media_prefix %}js/mousetrap-global-bind.min.js" type="text/javascript"></script>
+  <script src="{% get_media_prefix %}js/bootstrap-datepicker.js" type="text/javascript"></script>
  <script src="{% get_media_prefix %}bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
  <script src="{% get_media_prefix %}loader-bootstrap.js" type="text/javascript"></script>
  <script src="{% url 'js-catalog' %}" type="text/javascript"></script>

--- a/weblate/html/subproject.html
+++ b/weblate/html/subproject.html
@@ -89,9 +89,6 @@
 {% else %}
 <p>{% trans "Please choose the language into which you would like to translate." %}</p>
 {{ new_lang_form|crispy }}
-</td>
-</tr>
-</table>
 <p class="help-block"><a href="{% url 'contact' %}?subject=New+language+request+for+{{ object }}">{% trans "Can not find your language in above list?" %}</a></p>
 </div>
 <div class="panel-footer">

--- a/weblate/html/translate.html
+++ b/weblate/html/translate.html
@@ -411,7 +411,9 @@

 <a href="{% url 'js-get' checksum=unit.checksum %}" class="hidden" id="js-get"></a>
 <a href="{% url 'js-translate' unit_id=unit.id %}" class="hidden" id="js-translate"></a>
+{% if update_lock %}
 <a href="{% url 'js-lock' project=unit.translation.subproject.project.slug subproject=unit.translation.subproject.slug lang=unit.translation.language.code %}" class="hidden" id="js-lock"></a>
+{% endif %}

 {% endwith %}


--- a/weblate/html/translation.html
+++ b/weblate/html/translation.html
@@ -174,6 +174,7 @@
 <div class="panel-footer">
 <input type="submit" value="{% trans "Upload" %}" class="btn btn-default" />
 </div>
+</form>

 </div>
 </div>
@@ -217,6 +218,7 @@
 <div class="tab-pane" id="search">
 <div class="row">
 <div class="col-md-6">
+
 <form action="{{ object.get_translate_url }}" method="GET">
 <div class="panel panel-primary">
 <div class="panel-heading"><h4 class="panel-title">{% trans "Search" %}</h4></div>
@@ -230,6 +232,7 @@
 </form>

 </div>
+
 {% if review_form %}
 <div class="col-md-6">
 <form action="{{ object.get_translate_url }}" method="GET">

--- a/weblate/media/bootstrap/css/datepicker3.css
+++ b/weblate/media/bootstrap/css/datepicker3.css
--- a/weblate/media/js/bootstrap-datepicker.js
+++ b/weblate/media/js/bootstrap-datepicker.js
--- a/weblate/media/loader-bootstrap.js
+++ b/weblate/media/loader-bootstrap.js
@@ -223,7 +223,7 @@ $(function () {

    /* Git commit tooltip */
    $(document).tooltip({
-        selector: '.git-commit',
+        selector: '.html-tooltip',
        html: true
    });

@@ -392,4 +392,11 @@ $(function () {

    /* Table sorting */
    load_table_sorting();
+
+    /* Lock updates */
+    if ($('#js-lock').length > 0) {
+        window.setInterval(function () {
+            $.get($('#js-lock').attr('href'));
+        }, 19000);
+    }
 });
--- a/weblate/trans/forms.py
+++ b/weblate/trans/forms.py
@@ -532,7 +532,11 @@ class ReviewForm(forms.Form):
    date = forms.DateField(
        label=_('Starting date'),
        widget=forms.DateInput(
-            attrs={'type': 'date'},
+            attrs={
+                'type': 'date',
+                'data-provide': 'datepicker',
+                'data-date-format': 'yyyy-mm-dd',
+            },
            format='%Y-%m-%d'
        )
    )