The build string is now part of the mayan package metadata. Update forum link. Add instagram link.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-09-14 00:54:24 -04:00
parent 632f4b598b
commit 4df9fae737
5 changed files with 68 additions and 24 deletions

View File

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
__title__ = 'Mayan EDMS'
__version__ = '3.1b2'
__build__ = 0x030100
__build_string__ = 'v3.0.3-225-g632f4b598 Fri Sep 14 00:21:02 2018 -0400'
__author__ = 'Roberto Rosario'
__author_email__ = 'roberto.rosario@mayan-edms.com'
__description__ = 'Free Open Source Electronic Document Management System'
@@ -10,4 +11,3 @@ __license__ = 'Apache 2.0'
__copyright_short__ = '2011-2018 Roberto Rosario'
__copyright__ = '{} {}'.format('Copyright', __copyright_short__)
__website__ = 'https://www.mayan-edms.com'

View File

@@ -55,7 +55,7 @@
{% endblock stylesheets %}
{% block content %}
{% build as build_number %}
{% project_information '__build_string__' as build_number %}
{% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}
{% project_information '__title__' as project_title %}
@@ -102,11 +102,11 @@
</p>
<p class="text-center">
If you found a bug or got a feature idea, visit the <a class="new_window" href="https://groups.google.com/forum/#!forum/mayan-edms">forum <i class="far fa-life-ring"></i></a> or open a ticket in the <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms">GitLab repository <i class="fab fa-gitlab"></i></a>.
If you found a bug or got a feature idea, visit the <a class="new_window" href="https://forum.mayan-edms.com">forum <i class="far fa-life-ring"></i></a> or open a ticket in the <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms">GitLab repository <i class="fab fa-gitlab"></i></a>.
</p>
<p class="text-center">
Spread the word. Talk to your friends and colleagues about how awesome {% project_information '__title__' %} is!
Follow us on <a class="new_window" href="https://twitter.com/mayanedms">Twitter <i class="fab fa-twitter"></i></a> or <a class="new_window" href="https://www.facebook.com/MayanEDMS/">Facebook <i class="fab fa-facebook"></i></a>
Follow us on <a class="new_window" href="https://twitter.com/mayanedms">Twitter <i class="fab fa-twitter"></i></a>, <a class="new_window" href="https://www.facebook.com/MayanEDMS/">Facebook <i class="fab fa-facebook"></i></a>, or <a class="new_window" href="https://www.instagram.com/mayan_edms/">Instagram <i class="fab fa-instagram"></i></a>
</p>
</div>
{% endblock %}

View File

@@ -2,8 +2,6 @@ from __future__ import unicode_literals
from json import dumps
import sh
from django.template import Context, Library
from django.template.loader import get_template
from django.utils.encoding import force_text
@@ -16,24 +14,6 @@ from ..utils import check_for_sqlite, return_attrib
register = Library()
try:
BUILD = sh.Command('git').bake('describe', '--tags', '--always', 'HEAD')
DATE = sh.Command('git').bake('--no-pager', 'log', '-1', '--format=%cd')
except sh.CommandNotFound:
BUILD = None
DATE = None
@register.simple_tag
def build():
if BUILD:
try:
return '{} {}'.format(BUILD(), DATE())
except sh.ErrorReturnCode_128:
return ''
else:
return ''
@register.simple_tag
def check_sqlite():