Skip to content
Browse files

Merge branch 'master' of https://github.com/LethusTI/supportcenter

  • Loading branch information...
2 parents 364c27c + b3294f9 commit fbcf78d8dea23646e36eb7a3d2436f1e72e8cfd3 @wpjunior wpjunior committed Nov 7, 2013
View
60 supportcenter/contact/templates/contact/form.html
@@ -10,45 +10,47 @@
{% block header %}
<style type="text/css">
#id_name, #id_email, #id_title {
- width: 500px;
+ width: 500px;
}
#id_comment {
- width: 100%;
+ width: 100%;
}
#id_phone {
- width: 130px;
+ width: 130px;
}
</style>
{% endblock %}
{% block knowledge_widgets %}
-{% if not search %}
-{% endif %}
+<div id="page-header">
+ <div class="container">
+ <h1>{% trans "Contact" %}</h1>
+ <div id="live-search">
+ <form method="get" action="/faq/" autocomplete="off">
+ <input type="text" onfocus="if (this.value == 'Pesquise em nossa base de conhecimento...') {this.value = '';}" onblur="if (this.value == '') {this.value = 'Pesquise em nossa base de conhecimento...';}" value="Pesquise em nossa base de conhecimento..." name="title" id="s" autocomplete="off">
+ </form>
+ </div>
+ </div>
+</div>
<div id="primary" class="sidebar-off">
- <div class="container">
- <section id="content">
- <div class="dk-widget">
- <div class="page-header">
- <h3>
- {% trans "Contact" %}
- </h3>
- </div>
- <form id="form" novalidate action="." method="POST">
- {% csrf_token %}
-
- <p class="btn-group">
- <button type="submit" class="btn btn-primary">
- <i class="icon-ok icon-white"></i> {% trans "Send" %}
- </button>
- <button type="button" onclick="history.go(-1)" class="btn">
- <i class="icon-arrow-left"></i> {% trans "Back" %}
- </button>
- </p>
- {% include "master/form_snippet.html" %}
- </form>
+ <div class="container">
+ <section id="content">
+ <form id="form" novalidate action="." method="POST">
+ {% csrf_token %}
+ {% include "master/form_snippet.html" %}
- </div>
- </section>
- </div>
+ <br>
+ <p class="btn-group">
+ <button type="submit" class="btn btn-primary">
+ <i class="icon-ok icon-white"></i> {% trans "Send" %}
+ </button>
+ <button type="button" onclick="history.go(-1)" class="btn">
+ <i class="icon-arrow-left"></i> {% trans "Back" %}
+ </button>
+ </p>
+
+ </form>
+ </section>
+ </div>
</div>
{% endblock knowledge_widgets %}
View
4 supportcenter/faq/locale/pt_BR/LC_MESSAGES/django.po
@@ -147,6 +147,10 @@ msgstr "Retornar ao sistema"
msgid "Contact"
msgstr "Contato"
+#: templates/contact/form.html:45
+msgid "Send"
+msgstr "Enviar"
+
#: templates/faq/base.html:43
msgid "Administration"
msgstr "Administração"
View
1 supportcenter/faq/templates/faq/category_list.html
@@ -38,6 +38,7 @@
<tr>
<th scope="col">ID</th>
<th scope="col">{% trans "Title" %}</th>
+ <th scope="col">{% trans "Position" %}</th>
</tr>
</thead>
<tbody>
View
2 supportcenter/faq/views.py
@@ -134,7 +134,7 @@ class ListCategoryView(HybridListView):
template_name = 'faq/category_list.html'
paginate_by = 20
allow_empty = True
- json_object_list_fields = ['id', 'title']
+ json_object_list_fields = ['id', 'title', 'position']
filter_fields = ['title']
class CategoryMixIn(object):
View
4 supportcenter/forum/templates/forum/form.html
@@ -36,6 +36,8 @@
</div>
<form id="form" novalidate action="{% if object %}{{ object.get_absolute_url }}{% else %}.{% endif %}" method="POST">
{% csrf_token %}
+ {% include "master/form_snippet.html" %}
+ <br>
<p class="btn-group">
<button type="submit" class="btn btn-primary">
@@ -45,7 +47,7 @@
<i class="icon-arrow-left"></i> {% trans "Back" %}
</button>
</p>
- {% include "master/form_snippet.html" %}
+
</form>
</div>

0 comments on commit fbcf78d

Please sign in to comment.
Something went wrong with that request. Please try again.