#ARC-41

README.md

@@ -76,3 +76,19 @@ python manage.py generate_reviews
 ```
 
 ----------------------------------------
+
+# Tooltip examples
+
+```
+<div data-tooltip title="{% tooltip pk=123 %}"></div>
+```
+
+```
+<div
+    data-tooltip
+    data-placement="bottom"
+    title="{% tooltip name='Безопасная сделка' %}">
+</div>
+```
+
+----------------------------------------

assets/index.js

@@ -2,8 +2,9 @@
 
 $('.datepicker').datepicker()
 
-
+$('[data-tooltip]').tooltip({
-
+    container: 'body', // Remove unwanted side-effects
+})
 
 
 

common/admin.py

@@ -1,13 +1,20 @@
 from django.contrib import admin
 from mptt.admin import MPTTModelAdmin
 
-from .models import Location, MainPage, Settings, PrintOrder, PrintDocuments
+from .models import Location, MainPage, Settings, PrintOrder, PrintDocuments, Tooltip
+
 
 class LocationAdmin(MPTTModelAdmin):
     readonly_fields = ('pk', 'lft', 'rght', 'tree_id', 'level')
 
+
+class TooltipAdmin(admin.ModelAdmin):
+    readonly_fields = ('pk',)
+    list_display = ('name', 'pk', 'text')
+
 admin.site.register(Location, LocationAdmin)
 admin.site.register(MainPage)
-admin.site.register(Settings)
-admin.site.register(PrintOrder)
 admin.site.register(PrintDocuments)
+admin.site.register(PrintOrder)
+admin.site.register(Settings)
+admin.site.register(Tooltip, TooltipAdmin)

common/migrations/0006_tooltip.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 15:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0005_settings_accountant_send_email'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Tooltip',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True)),
+                ('text', models.TextField()),
+            ],
+            options={
+                'verbose_name_plural': 'Подсказки',
+                'verbose_name': 'Подсказка',
+            },
+        ),
+    ]

common/migrations/0007_tooltip_example.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 16:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0006_tooltip'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tooltip',
+            name='example',
+            field=models.TextField(default=''),
+            preserve_default=False,
+        ),
+    ]

common/migrations/0008_auto_20160829_1923.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 16:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0007_tooltip_example'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tooltip',
+            name='example',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='tooltip',
+            name='text',
+            field=models.TextField(blank=True),
+        ),
+    ]

common/models.py

@@ -84,3 +84,15 @@ class PrintDocuments(models.Model):
         verbose_name = 'Документы на распечатку'
         verbose_name_plural = 'Документы на распечатку'
 
+
+class Tooltip(models.Model):
+    name = models.CharField(max_length=255, unique=True)
+    text = models.TextField(blank=True)
+    example = models.TextField(blank=True)
+    
+    class Meta:
+        verbose_name = 'Подсказка'
+        verbose_name_plural = 'Подсказки'
+    
+    def __str__(self):
+        return self.name

common/templatetags/common_tags.py

@@ -3,13 +3,11 @@ from pprint import pprint, pformat
 import os
 
 from archilance import util
+from common.models import Tooltip
 
 
 register = template.Library()
 
-# @register.inclusion_tag('templatetags/inspect.html', takes_context=True)
-# def inspect(context, obj):
-#     return {'obj': pformat(obj.__dict__)}
 
 @register.simple_tag
 def morph_words(number, words):
@@ -94,4 +92,12 @@ def decap(val):
     return val
 
 
+@register.simple_tag
+def tooltip(**kwargs):
+    tooltip = util.get_or_none(Tooltip, **kwargs)
+    
+    if tooltip:
+        return tooltip.text
+
+
 # import code; code.interact(local=dict(globals(), **locals()))

projects/migrations/0018_auto_20160829_1837.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 15:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0017_arbitration'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='portfolio',
+            name='created',
+            field=models.DateTimeField(auto_created=True, auto_now_add=True),
+        ),
+    ]

projects/templates/customer_project_create.html

@@ -24,12 +24,12 @@
                             <div class="new-pp3" style="color: red; margin-top: 70px">{{ form.non_field_errors }}</div>
                         {% endif %}
                         
-                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                        <div data-tooltip title="{% tooltip pk=4 %}" class="textAreaBlock2 text-nn box-sizing disTab">
                             <p>Название заказа <span style="color: red">{{ form.name.errors.as_text }}</span></p>
                             <input type="text" class="box-sizing" name="{{ form.name.html_name }}" value="{{ form.name.value }}">
                         </div>
                         
-                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                        <div data-tooltip title="{% tooltip pk=5 %}" class="textAreaBlock2 text-nn box-sizing disTab">
                             <p>Подробно опишите задание <span style="color: red">{{ form.text.errors.as_text }}</span></p>
                             <textarea name="{{ form.text.html_name }}" id="text-new">{{ form.text.value }}</textarea>
                         </div>
@@ -53,7 +53,7 @@
                         </div>
                         
                         <p class="type-work">Тип работы <span style="color: red">{{ form.work_type.errors.as_text }}</span></p>
-                        <div class="mail-block type-work-inset">
+                        <div data-tooltip title="{% tooltip pk=6 %}" class="mail-block type-work-inset">
                             {% for id, text in form.work_type.field.choices %}
                                 <div class="inset-mb">
                                     <label>
@@ -83,7 +83,7 @@
                             <div class="col-lg-3"></div>
                             <div class="col-lg-3"></div>-->
                         </div>
-                        <div class="polsF1 disTab -spec-select-container">
+                        <div data-tooltip title="{% tooltip pk=7 %}" class="polsF1 disTab -spec-select-container">
                             <div class="col-lg-3">
                                 <input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
                             </div>
@@ -107,14 +107,14 @@
                             <!--<div class="col-lg-8"></div>-->
                         </div>
                         <div class="searchF1 polsF1 polsFF">
-                            <div class="col-lg-4">
+                            <div data-tooltip title="{% tooltip pk=8 %}" class="col-lg-4">
                                 <input type="text" class="box-sizing surr" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}">
                                 {{ form.currency }}
                             </div>
                             <div class="col-lg-3">
                                 {{ form.term_type }}
                             </div>
-                            <div class="col-lg-5 dog-new">
+                            <div data-tooltip title="{% tooltip pk=9 %}" class="col-lg-5 dog-new">
                                 <label>
                                     <input
                                         type="checkbox"
@@ -159,7 +159,7 @@
                                 </p>
                                 
                                 <p class="des-afer">
-                                    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro vel suscipit eaque quidem voluptate aperiam enim aut libero, excepturi architecto maxime, placeat maiores, odio itaque, ex consectetur dignissimos dicta officia
+                                    {% tooltip pk=10 as tooltip10 %}{{ tooltip10|linebreaksbr }}
                                 </p>
                             </div>
                             
@@ -179,7 +179,7 @@
                                 </p>
                                 
                                 <p class="des-afer">
-                                    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro vel suscipit eaque quidem voluptate aperiam enim aut libero, excepturi architecto maxime, placeat maiores, odio itaque, ex consectetur dignissimos dicta officia
+                                    {% tooltip pk=11 as tooltip11 %}{{ tooltip11|linebreaksbr }}
                                 </p>
                             </div>
                         </div>
@@ -192,7 +192,7 @@
                         <div class="resSearchF1">
                             <div class="col-lg-3">
                                 <p class="titleResF1">Расширенный поиск</p>
-                                <button class="resButtonF1">
+                                <button data-tooltip title="{% tooltip pk=12 %}" class="resButtonF1">
                                     <span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
                                 </button>
                             </div>
@@ -210,7 +210,7 @@
                             </div>
                             
                             <div class="polsF1 polsF2 disTab">
-                                <div class="col-lg-3">
+                                <div data-tooltip title="{% tooltip pk=13 %}" class="col-lg-3">
                                     <select
                                         class="selectpicker"
                                         id="realtyId"
@@ -222,7 +222,7 @@
                                             {% endfor %}
                                     </select>
                                 </div>
-                                <div class="col-lg-3">
+                                <div data-tooltip title="{% tooltip pk=14 %}" class="col-lg-3">
                                     <input
                                         type="text"
                                         id="realtyName"
@@ -230,7 +230,7 @@
                                         class="box-sizing surr surr2"
                                         value="{{ realty_form.name.value }}">
                                 </div>
-                                <div class="col-lg-3">
+                                <div data-tooltip title="{% tooltip pk=15 %}" class="col-lg-3">
                                     <select
                                         id="realtyBuildingClassificationId"
                                         class="selectpicker"
@@ -240,7 +240,7 @@
                                             {% endfor %}
                                     </select>
                                 </div>
-                                <div class="col-lg-3">
+                                <div data-tooltip title="{% tooltip pk=16 %}" class="col-lg-3">
                                     <select
                                         id="realtyConstructionTypeId"
                                         class="selectpicker"
@@ -255,6 +255,7 @@
                                 <div class="col-lg-12">Местоположение <span style="color: red">{{ realty_form.location.errors.as_text }}</span></div>
                             </div>
                             <div class="polsF1 polsF2 disTab">
+                                <div data-tooltip title="{% tooltip pk=18 %}">
                                     <div class="col-lg-3">
                                         <input type="hidden" class="-location-select -location-select-country" style="width: 100%">
                                     </div>
@@ -266,10 +267,11 @@
                                     <div class="col-lg-3">
                                         <input type="hidden" class="-location-select -location-select-city" style="width: 100%">
                                     </div>
+                                </div>
                                 
                                 <input type="hidden" id="chosenLocationId" name="{{ realty_form.location.html_name }}" value="{{ realty_form.location.value }}">
                                 
-                                <div class="col-lg-3 make-new">
+                                <div data-tooltip title="{% tooltip pk=17 %}" class="col-lg-3 make-new">
                                     <label>{{ form.cro }}<span></span></label>
                                     <p>Требуется допуск (СРО)</p>
                                 </div>

users/templates/contractor_office.html

@@ -17,7 +17,7 @@
             
             <div class="buttonGP disTab">
                 <div class="btn-group valProject2 val-pro3" role="group">
-                    {% if contractor.team %}
+                    {% if False and contractor.team %}
                         <button type="button" class="btn btn-default">
                             {{ contractor.team.name }}
                             <span><mark>0</mark></span>

work_sell/migrations/0007_auto_20160829_1837.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 15:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work_sell', '0006_remove_worksell_team'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='worksell',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+    ]