diff --git a/accounts/templates/account_comments.html b/accounts/templates/account_comments.html new file mode 100644 index 00000000..71b55e09 --- /dev/null +++ b/accounts/templates/account_comments.html @@ -0,0 +1,18 @@ +{% for comment in comments %} +
  • +
    +
    + + +
    +
    +
    {{comment.comment_user}} Commented
    +
    {{comment.comment}}
    +
    {{comment.comment_time}}
    +
  • +{% endfor %} \ No newline at end of file diff --git a/accounts/templates/accounts.html b/accounts/templates/accounts.html new file mode 100644 index 00000000..7fc7efb2 --- /dev/null +++ b/accounts/templates/accounts.html @@ -0,0 +1,147 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block content %} + +
    + +
    +
    +
    +
    +

    Accounts

    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    Filters
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + Clear +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + List of Accounts + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Accounts {{accounts_list|length}}{% endif %} +
    +
    + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page accounts_list %} + {% else%} + {% paginate 10 accounts_list %} + {% endif %} + {% for each_account in accounts_list %} + + + + + + + + + {% endfor %} + +
    S.noNameCityStateIndustryActions
    {{ forloop.counter }}{% if each_account.name %}{{ each_account.name }}{% endif %}{% if each_account.billing_address.city %}{{ each_account.billing_address.city }} {% else %} Not specified {% endif %}{% if each_account.billing_address.state %}{{ each_account.billing_address.state }} {% else %} Not specified {% endif %}{% if each_account.industry %}{{ each_account.industry }} {% else %} Not specified {% endif %} + View + Edit + +
    +
    + {% ifequal accounts_list|length 0 %} +
    No Acccount Records Found
    + {% endifequal %} +
    + {% show_pages %} +
    +
    +
    +
    +
    +
    + +
    + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} \ No newline at end of file diff --git a/accounts/templates/accounts_list.html b/accounts/templates/accounts_list.html new file mode 100644 index 00000000..a7c145d9 --- /dev/null +++ b/accounts/templates/accounts_list.html @@ -0,0 +1,38 @@ + + + + + + + + + {% ifequal accounts|length 0 %} + + + + {% endifequal %} + {% for account in accounts %} + + + + + {% endfor %} + +
    + + Name + + + + + Email + +
    + NO ACCOUNTS FOUND!! +
    + + {{ account.name }} + + + {{ account.email }} +
    \ No newline at end of file diff --git a/accounts/templates/create_account.html b/accounts/templates/create_account.html new file mode 100644 index 00000000..097210a2 --- /dev/null +++ b/accounts/templates/create_account.html @@ -0,0 +1,159 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} +{% block extralinks %} + +{% endblock %} + + +{% endblock %} +{% block content %} +
    +
    +
    +
    +
    +
    + CREATE ACCOUNT +
    +
    +
    +
    +
    + + {{ account_form.name }} + {{ account_form.name.errors }} +
    +
    +
    +
    + + {{ account_form.website }} + {{ account_form.website.errors }} +
    +
    +
    +
    + + {{ account_form.phone }} + {{ account_form.phone.errors }} +
    +
    +
    +
    + + {{ account_form.email }} + {{ account_form.email.errors }} +
    +
    +
    +
    + + {{ account_form.industry }} + {{ account_form.industry.errors }} +
    +
    +
    +
    + + {{ account_form.description }} + {{ account_form.description.errors }} +
    +
    +
    +
    +
    +
    + + {{request.POST.assigned_to}} + + {{ account_form.assigned_to.errors }} +
    +
    +
    +
    +
    + + {{ billing_form.address_line }} + {{ billing_form.address_line.errors }} +
    + {{ billing_form.street }} + {{ billing_form.street.errors }} +
    +
    + {{ billing_form.city }} + {{ billing_form.city.errors }} +
    +
    + {{ billing_form.state }} + {{ billing_form.state.errors }} +
    +
    + {{ billing_form.postcode }} + {{ billing_form.postcode.errors }} +
    +
    + {{ billing_form.country }} + {{ billing_form.country.errors }} +
    +
    +
    +
    +
    Copy Address
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    + + {% if not account_obj %} + + {% endif %} + CANCEL +
    +
    +{% endblock %} +{% block js_block %} + + +{% endblock js_block %} diff --git a/accounts/templates/view_account.html b/accounts/templates/view_account.html new file mode 100644 index 00000000..2497f392 --- /dev/null +++ b/accounts/templates/view_account.html @@ -0,0 +1,2098 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb1 %} + + + +{% endblock breadcrumb1 %} +{% block content %} + +
    +
    +
    +
    +
    +
    +
    + Overview + + + +
    +
    +
    +
    + {% if account_record.name %} +
    +
    + + +
    +
    + {% endif %} + {% if account_record.phone %} +
    +
    + + +
    +
    + {% endif %} + {% if account_record.email %} +
    +
    + + +
    +
    + {% endif %} + {% if account_record.website %} +
    +
    + + +
    +
    + {% endif %} + {% if account_record.industry %} +
    +
    + + +
    +
    + {% endif %} +
    +
    + {% if account_record.billing_address.address_line or account_record.billing_address.street or account_record.billing_address.city or account_record.billing_address.state or account_record.billing_address.postcode or account_record.billing_address.country %} +
    +
    + + +
    +
    + {% endif %} + {% if account_record.shipping_address.address_line or account_record.shipping_address.street or account_record.shipping_address.city or account_record.shipping_address.state or account_record.shipping_address.postcode or account_record.shipping_address.country %} +
    +
    + + +
    +
    + {% endif %} + {% if account_record.description %} +
    +
    + + +
    +
    + {% endif %} +
    +
    +
    + +
    +
    +
    Comments
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
      + {% for comment in comments %} +
    • +
      +
      + + +
      +
      +
      {{ comment.comment }}
      +
      +
      {{ comment.commented_by }}
      +
      {{ comment.commented_on }}
      +
      +
    • + {% endfor %} +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    Label
    +
    +
    +
    +
    + {%if account_record.assigned_to.all %} + + + {% endif %} +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + Contacts + +
    +
    + + + + + + + + + + + + {% for contact in contacts %} + + + + + + + + {% endfor %} + +
    S.NoContact NamePhoneEmailActions
    {{ forloop.counter }}{{ contact.first_name }} {{ contact.last_name }}{{ contact.phone }}{{ contact.email }} + + + Delete +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + {% for contact in contacts %} + + {% endfor %} + + + {% for contact in contacts %} + + {% endfor %} + + +
    +
    +
    +
    + +
    +
    + Opportunities + +
    +
    + + + + + + + + + + + + {% for opportunity in opportunity_list %} + + + + + + + + {% endfor %} + +
    S.NoNameStageProbabilityActions
    {{ forloop.counter }}{{opportunity.name}}{{opportunity.stage}}{{opportunity.probability}} {% if opportunity.probability %} % {% endif %} + + + REMOVE +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + {% for opportunity in opportunity_list %} + + {% endfor %} + + + {% for opportunity in opportunity_list %} + + {% endfor %} + + +
    +
    +
    +
    + +
    +
    + Cases + +
    +
    + + + + + + + + + + + + {% for case in cases %} + + + + + + + + {% endfor %} + +
    S.NoNameStatusPriorityActions
    {{ forloop.counter }}{{ case.name }}{{ case.status }}{{ case.priority }} + + + REMOVE + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + {% for case in cases %} + + {% endfor %} + + + {% for case in cases %} + + {% endfor %} + +{% endblock content %} +{% block js_block %} + + +{% endblock js_block %} diff --git a/accounts/tests.py b/accounts/tests.py index 33651833..169d1b30 100644 --- a/accounts/tests.py +++ b/accounts/tests.py @@ -35,7 +35,7 @@ class AccountsCreateTestCase(AccountCreateTest, TestCase): 'name': "Uday", 'email': "udayteja@micropyramid.com", 'phone': "", 'billing_address': self.address, 'shipping_address': self.address, 'website': "www.uday.com", 'industry': "SOFTWARE", 'description': "Yes.. Testing Done"}) - self.assertTemplateUsed(response, 'accounts/create_account.html') + self.assertTemplateUsed(response, 'create_account.html') class AccountsListTestCase(AccountCreateTest, TestCase): @@ -43,7 +43,7 @@ class AccountsListTestCase(AccountCreateTest, TestCase): self.accounts = Account.objects.all() response = self.client.get('/accounts/list/') self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, 'accounts/accounts.html') + self.assertTemplateUsed(response, 'accounts.html') class AccountsCountTestCase(AccountCreateTest, TestCase): @@ -57,7 +57,7 @@ class AccountsViewTestCase(AccountCreateTest, TestCase): self.accounts = Account.objects.all() response = self.client.get('/accounts/'+ str(self.account.id) +'/view/') self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, 'accounts/view_account.html') + self.assertTemplateUsed(response, 'view_account.html') class AccountsRemoveTestCase(AccountCreateTest, TestCase): @@ -78,7 +78,7 @@ class AccountsUpdateUrlTestCase(AccountCreateTest, TestCase): 'shipping_address': self.address, 'website': "www.uday.com", 'industry': "SOFTWARE", 'description': "Yes.. Testing Done"}) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, 'accounts/create_account.html') + self.assertTemplateUsed(response, 'create_account.html') def test_accounts_update_status(self): response = self.client.get('/accounts/'+ str(self.account.id) +'/edit/') @@ -86,7 +86,7 @@ class AccountsUpdateUrlTestCase(AccountCreateTest, TestCase): def tst_accounts_update_html(self): response = self.client.get('/accounts/'+ str(self.account.id) +'/edit/') - self.assertTemplateUsed(response, 'accounts/create_account.html') + self.assertTemplateUsed(response, 'create_account.html') class AccountCreateEmptyFormTestCase(AccountCreateTest, TestCase): diff --git a/accounts/views.py b/accounts/views.py index 5bb4733f..1f79bdfe 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -27,7 +27,7 @@ def accounts_list(request): if industry: accounts_list = accounts_list.filter(industry__icontains=industry) - return render(request, "accounts/accounts.html", { + return render(request, "accounts.html", { 'accounts_list': accounts_list, 'industries': INDCHOICES, 'per_page': page @@ -62,7 +62,7 @@ def add_account(request): else: return redirect("accounts:list") else: - return render(request, 'accounts/create_account.html', { + return render(request, 'create_account.html', { 'account_form': account_form, 'billing_form': billing_form, 'shipping_form': shipping_form, @@ -75,7 +75,7 @@ def add_account(request): }) else: - return render(request, 'accounts/create_account.html', { + return render(request, 'create_account.html', { 'account_form': account_form, 'billing_form': billing_form, 'shipping_form': shipping_form, @@ -97,7 +97,7 @@ def view_account(request, account_id): users = User.objects.filter(is_active=True).order_by('email') cases = Case.objects.filter(account=account_record) teams = Team.objects.all() - return render(request, "accounts/view_account.html", { + return render(request, "view_account.html", { 'account_record': account_record, 'opportunity_list': opportunity_list, 'stages': STAGES, @@ -145,7 +145,7 @@ def edit_account(request, edid): account_object.teams.add(*teams_list) return redirect("accounts:list") else: - return render(request, 'accounts/create_account.html', { + return render(request, 'create_account.html', { 'account_form': account_form, 'billing_form': billing_form, 'shipping_form': shipping_form, @@ -160,7 +160,7 @@ def edit_account(request, edid): 'teams_list': teams_list }) else: - return render(request, 'accounts/create_account.html', { + return render(request, 'create_account.html', { 'account_form': account_form, 'billing_form': billing_form, 'shipping_form': shipping_form, @@ -248,9 +248,9 @@ def remove_comment(request): @login_required def get_accounts(request): if request.method == 'GET': - if request.user.is_authenticated(): + if request.user.is_authenticated: accounts = Account.objects.all() - return render(request, 'accounts/accounts_list.html', { + return render(request, 'accounts_list.html', { 'accounts': accounts}) else: return HttpResponseRedirect('accounts/login') diff --git a/cases/templates/cases.html b/cases/templates/cases.html new file mode 100644 index 00000000..86058c50 --- /dev/null +++ b/cases/templates/cases.html @@ -0,0 +1,188 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block content %} + +
    + +
    +
    +
    +
    +

    Cases

    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    Filters
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + + +
    +
    + +
    +
    + + Clear +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    + List of Cases + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Cases {{ cases|length }}{% endif %} +
    +
    + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page cases %} + {% else%} + {% paginate 10 cases%} + {% endif %} + {% for case in cases %} + + + + + + + + + {% endfor %} + +
    S.NoNameAccountStatusPriorityActions
    {{ forloop.counter }}{{ case.name }} + {% if case.account %} + {{ case.account }} + {% else %} + No Related Account + {% endif %} + {{ case.status }}{{ case.priority }} + View + Edit + + {% if case.status != 'Closed' %} + Close + {% endif %} +
    +
    + {% ifequal cases|length 0 %} +
    No Cases Records Found
    + {% endifequal %} +
    + {% show_pages %} +
    +
    +
    +
    +
    + +
    + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} \ No newline at end of file diff --git a/cases/templates/cases_list.html b/cases/templates/cases_list.html new file mode 100644 index 00000000..fdcde00b --- /dev/null +++ b/cases/templates/cases_list.html @@ -0,0 +1,38 @@ + + + + + + + + + {% ifequal cases|length 0 %} + + + + {% endifequal %} + {% for case in cases %} + + + + + {% endfor %} + +
    + + Name + + + + + Status + +
    + NO CASES FOUND!! +
    + + {{ case.name }} + + + {{ case.status }} +
    \ No newline at end of file diff --git a/cases/templates/comments.html b/cases/templates/comments.html new file mode 100644 index 00000000..9628ba8d --- /dev/null +++ b/cases/templates/comments.html @@ -0,0 +1,20 @@ + +{% for comment in comments %} +
  • +
    +
    + + +
    +
    +
    {{comment.comment_user}} Commented
    +
    {{comment.comment}}
    +
    {{comment.comment_time}}
    {%if comment.get_file%}{{comment.get_file}}{% endif %} + {% endfor %} diff --git a/cases/templates/create_cases.html b/cases/templates/create_cases.html new file mode 100644 index 00000000..a5a17164 --- /dev/null +++ b/cases/templates/create_cases.html @@ -0,0 +1,148 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} +{% block extralinks %} + +{% endblock %} + + +{% endblock %} +{% block content %} +
    +
    +
    +
    +
    +
    + CREATE CASE +
    +
    +
    +
    +
    + + {{ case_form.name }} + {{ case_form.name.errors }} +
    +
    +
    +
    + + {{ case_form.status }} + {{ case_form.status.errors }} +
    +
    +
    +
    + + {{ case_form.priority }} + {{ case_form.priority.errors }} +
    +
    +
    +
    + + {{ case_form.case_type }} + {{ case_form.case_type.errors }} +
    +
    +
    +
    + +
    + {{ case_form.closed_on }} + + + +
    + {{ case_form.closed_on.errors }} +
    +
    +
    +
    +
    +
    + + + {{ case_form.assigned_to.errors }} +
    +
    +
    +
    + + {{ case_form.account }} + {{case_form.account.errors}} +
    +
    +
    +
    + + {{ case_form.contacts }} +
    +
    +
    +
    + + {{ case_form.description }} + {{ case_form.description.errors }} +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    + + {% if not case_obj %} + + {% endif %} + Cancel +
    +
    +{% endblock %} +{% block js_block %} + + +{% endblock js_block %} diff --git a/cases/templates/sel_contacts.html b/cases/templates/sel_contacts.html new file mode 100644 index 00000000..e4f023f4 --- /dev/null +++ b/cases/templates/sel_contacts.html @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/cases/templates/show_case.html b/cases/templates/show_case.html new file mode 100644 index 00000000..e2719604 --- /dev/null +++ b/cases/templates/show_case.html @@ -0,0 +1,791 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block content %} + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    {{case.name}}
    +
    +
    +
    +
    + +
    {%ifequal case.status None%}Not Specified + {% else %}{{case.status}}{% endifequal %}
    +
    +
    +
    +
    + +
    {%ifequal case.priority None%}Not Specified + {% else %}{{case.priority}}{% endifequal %}
    +
    +
    +
    +
    + +
    + {%ifequal case.case_type None%}Not Specified + {% else %}{{case.case_type}}{% endifequal %}
    +
    +
    +
    +
    +
    +
    + +
    {%ifequal case.account None%}Not Specified + {% else %}{{case.account}}{% endifequal %}
    +
    +
    +
    +
    + +
    + {% ifequal contacts "None" %}Not Specified{% endifequal %} + {% for c in contacts %} +
    {{c.name}}
    + {% endfor %}
    +
    +
    +
    +
    + +
    {% if case.description%}{{case.description}}{% else%}Not Specified{% endif%}
    +
    +
    + +
    + +
    +
    +

    Comments

    +
    + + +
      + + + +
      + + +
        + {% for comment in comments %} +
      • +
        +
        + + +
        +
        +
        {{comment.comment_user}} Commented
        +
        {{comment.comment}}
        +
        {{comment.comment_time}}
        +
        {% for com in comment.get_files %} + + {% endfor %}
        + {% endfor %} +
      +
      + + + + + +
      +
      +
      +
      + +
      +
      +
      +
      Users&Teams
      +
      +
      +
      +
      +
      + +
      {{ a_user.username }}{% ifequal a_user "None" %}Not Specified{% endifequal %}
      +
      +
      +
      +
      + +
      {% ifequal case.teams None%}Not Specified + {% else %}{{case.teams}}{% endifequal %} +
      +
      +
      +
      +
      + +
      {{case.created}}
      +
      +
      +
      + +
      {{case.userid}}
      +
      +
      +
      +
      +
      + +
      +
      +

      + Activities +

      +
      +
      + +
      +
      +
      +
      +
        + {% ifequal case.get_meetings|length 0 %} +
      • No Meetings
      • + {% else %} + {% for meet in case.get_meetings %} +
      • +
        +
        + + +
        +
        +
        + + + + + {{meet.name}} + +
        +
        + {{meet.start_date}} +
        +
      • + {% endfor %} + {% endifequal %} +
      +
      + +
      +
        + {% ifequal case.get_tasks|length 0 %} +
      • No Tasks
      • + {% else %} + {% for meet in case.get_tasks %} +
      • +
        +
        + + +
        +
        +
        + + + + + {{meet.name}} + +
        +
        + {{meet.start_date}} +
        +
      • + {% endfor %} + {% endifequal %} +
      +
      + + +
      +
        + {% ifequal case.get_calls|length 0 %} +
      • No Calls
      • + {% else %} + {% for call in case.get_calls %} +
      • +
        +
        + + +
        +
        +
        + + + + + {{call.name}} + +
        +
        + + {{call.start_date}} +
        +
      • + {% endfor %} + {% endifequal %} +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + + +
      +
      +

      + History +

      +
      +
      + +
      +
      +
      +
      +
        + {% ifequal case.get_completed_meetings|length 0 %} +
      • No Data
      • + {% else %} + {% for meet in case.get_completed_meetings %} +
      • +
        +
        + + +
        +
        +
        + + + + + {{meet.name}} | {{ meet.status }} + +
        +
        + {{meet.start_date}} +
        +
      • + {% endfor %} + {% endifequal %} +
      +
      + +
      +
        + {% ifequal case.get_completed_tasks|length 0 %} +
      • No Tasks
      • + {% else %} + {% for meet in case.get_completed_tasks %} +
      • +
        +
        + + +
        +
        +
        + + + + + {{meet.name}} | {{meet.status }} + +
        +
        + {{meet.start_date}} +
        +
      • + {% endfor %} + {% endifequal %} +
      +
      + + +
      +
        + {% ifequal case.get_completed_calls|length 0 %} +
      • No Calls
      • + {% else %} + {% for call in case.get_completed_calls %} +
      • +
        +
        + + +
        +
        +
        + + + + + {{ call.name }} | {{ call.status }} + +
        +
        + + {{ call.start_date }} +
        +
      • + {% endfor %} + {% endifequal %} +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + + + + + + + + +
      +
      + {% endblock %} + + {% block js_block %} + + + + {% endblock js_block %} diff --git a/cases/templates/view_case.html b/cases/templates/view_case.html new file mode 100644 index 00000000..74b57327 --- /dev/null +++ b/cases/templates/view_case.html @@ -0,0 +1,395 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block content %} + +
      +
      +
      +
      + +
      +
      +
      + Overview + + + +
      +
      +
      +
      +
      +
      + +
      {{ case_record.name }}
      +
      +
      +
      + {% if case_record.account %} +
      + +
      {{ case_record.account }}
      +
      + {% endif %} +
      +
      + {% if case_record.contacts.all %} +
      + +
      + {% for contact in case_record.contacts.all %} +
    • {{ contact }}
    • + {% endfor %} + + + {% endif %} + +
      + {% if case_record.closed_on %} +
      + +
      {{ case_record.closed_on|date }}
      +
      + {% endif %} +
      + +
      +
      +
      + +
      {{ case_record.status }}
      +
      +
      +
      +
      + +
      {{ case_record.priority }}
      +
      +
      +
      + {% if case_record.case_type %} +
      + +
      {{ case_record.case_type }}
      +
      + {% endif %} +
      +
      +
      +
      + {% if case_record.description %} +
      + +
      {{ case_record.description }}
      +
      + {% endif %} +
      +
      + + + + +
      +
      +
      Comments
      +
      +
      +
      +
      +
      + +
      +
      + +
      +
      + +
      +
        + {% for comment in comments %} +
      • +
        +
        + + +
        +
        +
        {{ comment.comment }}
        +
        +
        {{ comment.commented_by }}
        +
        {{ comment.commented_on }}
        +
        +
      • + {% endfor %} +
      +
      +
      + +
      + + + +
      +
      + +
      +
      +
      Label
      +
      +
      +
      +
      + {% if case_record.assigned_to.all %} + +
      + {% for user in case_record.assigned_to.all %} +
    • {{ user }}
    • + {% endfor %} +
      + {% endif %} +
      +
      + +
      +
      + +
      + {{ case_record.created_on }} +
      +
      +
      +
      +
      + +
      + {{ case_record.created_by }} +
      +
      +
      +
      +
      +
      +
      + + + + +{% endblock %} +{% block js_block %} + + + + +{% endblock js_block %} diff --git a/cases/templates/view_contacts.html b/cases/templates/view_contacts.html new file mode 100644 index 00000000..ba282309 --- /dev/null +++ b/cases/templates/view_contacts.html @@ -0,0 +1,3 @@ +{% for c in contacts %} +
      {{c.name}}
      +{% endfor %} \ No newline at end of file diff --git a/cases/tests.py b/cases/tests.py index 1f6fc3d1..2b25e33b 100644 --- a/cases/tests.py +++ b/cases/tests.py @@ -45,7 +45,7 @@ class CaseViewTestCase(CaseCreation, TestCase): self.assertEqual(response.status_code, 200) self.assertEqual(response.context['cases'][0].id, self.case.id) self.assertTrue(response.context['cases']) - self.assertTemplateUsed(response, 'cases/cases.html') + self.assertTemplateUsed(response, 'cases.html') class CaseCreationUrlTestCase(CaseCreation, TestCase): @@ -61,7 +61,7 @@ class CaseCreationUrlTestCase(CaseCreation, TestCase): 'account': self.account, 'contacts': self.contacts, 'priority': "Low", 'description': "something", 'teams': 'Sales'}) - self.assertTemplateUsed(response, 'cases/create_cases.html') + self.assertTemplateUsed(response, 'create_cases.html') class CaseShowTestCase(CaseCreation, TestCase): @@ -72,7 +72,7 @@ class CaseShowTestCase(CaseCreation, TestCase): def test_show_case_html(self): response = self.client.get('/cases/' + str(self.case.id) + '/view/') - self.assertTemplateUsed(response, 'cases/view_case.html') + self.assertTemplateUsed(response, 'view_case.html') def test_show_case_invalid_data(self): response = self.client.get('/cases/' + str(self.case.id) + '/view/') @@ -96,6 +96,6 @@ class CaseUpdateTestCase(CaseCreation, TestCase): def test_case_update_html(self): response = self.client.post('/cases/' + str(self.case.id) + '/edit_case/', {'hiddenval': self.case.id}) - self.assertTemplateUsed(response, 'cases/create_cases.html') + self.assertTemplateUsed(response, 'create_cases.html') diff --git a/cases/views.py b/cases/views.py index 10cd9318..7194ae03 100644 --- a/cases/views.py +++ b/cases/views.py @@ -32,7 +32,7 @@ def cases_list(request): cases = cases.filter(status=status) if priority: cases = cases.filter(priority=priority) - return render(request, "cases/cases.html", { + return render(request, "cases.html", { 'cases': cases, 'accounts': accounts, 'acc': int(account), @@ -70,7 +70,7 @@ def add_case(request): else: if request.is_ajax(): return JsonResponse({'error': True, 'case_errors': form.errors}) - return render(request, "cases/create_cases.html", { + return render(request, "create_cases.html", { 'case_form': form, 'accounts': accounts, 'users': users, @@ -82,7 +82,7 @@ def add_case(request): 'assignedto_list': [int(user_id) for user_id in assignedto_list], 'contacts_list': contacts_list }) - return render(request, "cases/create_cases.html", { + return render(request, "create_cases.html", { 'case_form': form, 'accounts': accounts, 'users': users, @@ -101,7 +101,7 @@ def view_case(request, case_id): case_record = get_object_or_404( Case.objects.prefetch_related("contacts", "account"), id=case_id) comments = case_record.cases.all() - return render(request, "cases/view_case.html", { + return render(request, "view_case.html", { 'case_record': case_record, 'comments': comments }) @@ -141,7 +141,7 @@ def edit_case(request, case_id): else: if request.is_ajax(): return JsonResponse({'error': True, 'case_errors': form.errors}) - return render(request, "cases/create_cases.html", { + return render(request, "create_cases.html", { 'case_obj': case_object, 'case_form': form, 'accounts': accounts, @@ -155,7 +155,7 @@ def edit_case(request, case_id): 'contacts_list': contacts_list }) - return render(request, "cases/create_cases.html", { + return render(request, "create_cases.html", { 'case_form': form, 'case_obj': case_object, 'accounts': accounts, @@ -278,6 +278,6 @@ def remove_comment(request): def get_cases(request): if request.method == 'GET': cases = Case.objects.all() - return render(request, 'cases/cases_list.html', {'cases': cases}) + return render(request, 'cases_list.html', {'cases': cases}) else: return HttpResponse('Oops!! Something Went Wrong.. in load_calls') diff --git a/common/templates/create.html b/common/templates/create.html new file mode 100644 index 00000000..0105a5fe --- /dev/null +++ b/common/templates/create.html @@ -0,0 +1,78 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} + + +{% endblock breadcrumb %} +{% block content %} +
      +
      +
      +
      +
      +
      + CREATE USER +
      +
      +
      +
      +
      + + +
      + {{ errors.first_name }} +
      +
      +
      + + +
      + {{ errors.last_name }} +
      +
      +
      + + +
      + {{ errors.username }} +
      +
      +
      + + +
      + {{ errors.email }} +
      +
      +
      + + {{ user_form.role }} + {{ user_form.role.errors }} +
      +
      + {% if not user_obj %} +
      +
      + + +
      + {{ errors.password }} +
      + {% endif %} +
      +
      +
      + + Cancel +
      +
      +
      +
      +
      +
      +{% endblock content %} diff --git a/common/templates/list.html b/common/templates/list.html new file mode 100644 index 00000000..b99cfbb2 --- /dev/null +++ b/common/templates/list.html @@ -0,0 +1,141 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block content %} + +
      + +
      +
      +
      +
      +

      Users

      +
      +
      + +
      +
      +
      +
      + + +
      +
      +
      +
      +
      Filters
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + Clear +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      + List of Users + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Users {{ users|length }}{% endif %} +
      +
      + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page users %} + {% else %} + {% paginate 10 users %} + {% endif %} + {% for user in users %} + + + + + + + + + {% endfor %} + +
      S.NoFirst NameUsernameEmail AddressStatusActions
      {{ forloop.counter }}{{ user.first_name }}{{ user.username }}{{ user.email }} + {% if user.is_active == True %} + Active + {% else %} + InActive + {% endif %} + + + Edit + +
      +
      + {% ifequal users|length 0 %} +
      No User Records Found
      + {% endifequal %} +
      + {% show_pages %} +
      +
      +
      +
      +
      +
      + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} \ No newline at end of file diff --git a/common/views.py b/common/views.py index 355d5942..e1be1465 100644 --- a/common/views.py +++ b/common/views.py @@ -100,7 +100,7 @@ def users_list(request): users_list = users_list.filter(username__icontains=username) if email: users_list = users_list.filter(email__icontains=email) - return render(request, "users/list.html", { + return render(request, "list.html", { 'users': users_list, 'active_users': active_users, 'per_page': page, 'inactive_users': inactive_users }) @@ -118,9 +118,9 @@ def create_user(request): user.save() return redirect("common:users_list") else: - return render(request, 'users/create.html', {'user_form': user_form, "errors": user_form.errors}) + return render(request, 'create.html', {'user_form': user_form, "errors": user_form.errors}) else: - return render(request, 'users/create.html', {'user_form': user_form}) + return render(request, 'create.html', {'user_form': user_form}) @admin_required @@ -129,7 +129,7 @@ def view_user(request, user_id): user_obj = User.objects.filter(id=user_id) active_users = User.objects.filter(is_active=True) inactive_users = User.objects.filter(is_active=False) - return render(request, "users/list.html", { + return render(request, "list.html", { 'users': users_list, 'user_obj': user_obj, 'active_users': active_users, 'inactive_users': inactive_users }) @@ -148,9 +148,9 @@ def edit_user(request, user_id): else: return redirect("common:users_list") else: - return render(request, 'users/create.html', {'user_form': user_form, "errors": user_form.errors}) + return render(request, 'create.html', {'user_form': user_form, "errors": user_form.errors}) else: - return render(request, 'users/create.html', {'user_form': user_form, 'user_obj': user_obj}) + return render(request, 'create.html', {'user_form': user_form, 'user_obj': user_obj}) @admin_required diff --git a/contacts/templates/contacts.html b/contacts/templates/contacts.html new file mode 100644 index 00000000..cc3f462f --- /dev/null +++ b/contacts/templates/contacts.html @@ -0,0 +1,163 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block content %} + +
      + +
      +
      +
      +
      +

      Contacts

      +
      + +
      +
      +
      + + +
      +
      +
      + +
      +
      +
      Filters
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + Clear +
      +
      +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      + +
      +
      + List of Contacts + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Contacts {{contact_obj_list|length}}{% endif %} +
      +
      + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page contact_obj_list %} + {% else%} + {% paginate 10 contact_obj_list %} + {% endif %} + {% for contact in contact_obj_list %} + + + + + + + + + {% endfor%} + +
      S.noNameAccountCityStateActions
      {{ forloop.counter }}{{contact.first_name}} + {% if contact.account %} + {{contact.account}} + {% else %} + No Related Account + {% endif %} + + {% if contact.address.city %} + {{contact.address.city}} + {% else %} + Not Specified + {% endif %} + + {% if contact.address.state %} + {{contact.address.state}} + {% else %} + Not Specified + {% endif %} + + View + Edit + +
      +
      + {%ifequal contact_obj_list|length 0 %} +
      No Contact Records Found
      + {%endifequal%} +
      + {% show_pages %} +
      +
      +
      +
      +
      +
      + +
      + +{%endblock%} +{% block js_block %} + +{% endblock js_block %} \ No newline at end of file diff --git a/contacts/templates/contacts_list.html b/contacts/templates/contacts_list.html new file mode 100644 index 00000000..f83f39d6 --- /dev/null +++ b/contacts/templates/contacts_list.html @@ -0,0 +1,38 @@ + + + + + + + + + {% ifequal contacts|length 0 %} + + + + {% endifequal %} + {% for contact in contacts %} + + + + + {% endfor %} + +
      + + Name + + + + + Email + +
      + NO CONTACTS FOUND!! +
      + + {{ contact.name }} + + + {{ contact.email }} +
      \ No newline at end of file diff --git a/contacts/templates/create_contact.html b/contacts/templates/create_contact.html new file mode 100644 index 00000000..9eaec562 --- /dev/null +++ b/contacts/templates/create_contact.html @@ -0,0 +1,138 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} +{% block extralinks %} + +{% endblock %} + + +{% endblock %} +{% block content %} +
      +
      +
      +
      +
      +
      + CREATE CONTACT +
      +
      +
      +
      +
      + +
      +
      + {{ contact_form.first_name }} + {{ contact_form.first_name.errors }} +
      +
      + {{ contact_form.last_name }} + {{ contact_form.last_name.errors }} +
      +
      +
      +
      +
      +
      + + {{ contact_form.account }} + {{ contact_form.account.errors }} +
      +
      +
      +
      + + {{ contact_form.phone }} + {{ contact_form.phone.errors }} +
      +
      +
      +
      + + {{ contact_form.email }} + {{ contact_form.email.errors }} +
      +
      +
      +
      + + + {{ contact_form.assigned_to.errors }} +
      +
      +
      +
      +
      +
      + + {{ address_form.address_line }} + {{ address_form.address_line.errors }} +
      + {{ address_form.street }} + {{ address_form.street.errors }} +
      +
      + {{ address_form.city }} + {{ address_form.city.errors }} +
      +
      + {{ address_form.state }} + {{ address_form.state.errors }} +
      +
      + {{ address_form.postcode }} + {{ address_form.postcode.errors }} +
      +
      + {{ address_form.country }} + {{ address_form.country.errors }} +
      +
      +
      +
      +
      +
      + + {{ contact_form.description }} + {{ contact_form.description.errors }} +
      +
      +
      +
      +
      +
      +
      + +
      +
      + + {% if not contact_obj %} + + {% endif %} + Cancel +
      +
      +{% endblock %} +{% block js_block %} + + +{% endblock js_block %} diff --git a/contacts/templates/view_contact.html b/contacts/templates/view_contact.html new file mode 100644 index 00000000..42aac195 --- /dev/null +++ b/contacts/templates/view_contact.html @@ -0,0 +1,321 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} + +{%endblock%} +{%block content%} + +
      +
      +
      +
      + +
      +
      +
      + overview + + + +
      +
      +
      +
      +
      +
      + +
      {{ contact_record.first_name }} {{ contact_record.last_name }}
      +
      +
      +
      +
      + +
      {{ contact_record.account }}
      +
      +
      +
      +
      + +
      {{ contact_record.phone }}
      +
      +
      +
      +
      + +
      {{ contact_record.email }}
      +
      +
      +
      +
      +
      +
      + {% if contact_record.address.address_line or contact_record.address.street or contact_record.address.city or contact_record.address.state or contact_record.address.postcode or contact_record.address.country %} + +
      + {% if contact_record.address.address_line %} + Address Line:{{contact_record.address.address_line}}
      + {% endif %} + {% if contact_record.address.street %} + Street:{{ contact_record.address.street }}
      + {% endif %} + {% if contact_record.address.city %} + City: {{ contact_record.address.city }}
      + {% endif %} + {% if contact_record.address.state %} + State:{{ contact_record.address.state }}
      + {% endif %} + {% if contact_record.address.postcode %} + Post Code:{{ contact_record.address.postcode }}
      + {% endif %} + {% if contact_record.address.country %} + Country: {{ contact_record.address.get_country_display }} + {% endif %} +
      + {% endif %} +
      +
      +
      +
      + {% if contact_record.description %} + +
      {{ contact_record.description }}
      + {% endif %} +
      +
      +
      +
      +
      + + +
      +
      +
      Comments
      +
      +
      +
      +
      +
      + +
      +
      + +
      +
      + +
      +
        + {% for comment in comments %} +
      • +
        +
        + + +
        +
        +
        {{ comment.comment }}
        +
        +
        {{ comment.commented_by }}
        +
        {{ comment.commented_on }}
        +
        +
      • + {% endfor %} +
      +
      +
      + +
      + +
      +
      +
      +
      + +
      +
      +
      Label
      +
      +
      +
      +
      + {%if contact_record.assigned_to.all %} + +
      + {% for user in contact_record.assigned_to.all %} +
    • {{ user }}
    • + {% endfor %} +
      + {% endif %} +
      +
      + +
      +
      + +
      + {{ contact_record.created_on }} +
      +
      +
      +
      +
      + +
      + {{ contact_record.created_by }} +
      +
      +
      +
      +
      +
      +
      +
      +
      + +{% endblock%} +{% block js_block %} + +{% endblock js_block %} \ No newline at end of file diff --git a/contacts/tests.py b/contacts/tests.py index e1f295ec..208a2836 100644 --- a/contacts/tests.py +++ b/contacts/tests.py @@ -47,7 +47,7 @@ class ContactViewsTestCase(ContactObjectsCreation, TestCase): def test_contacts_list_html(self): response = self.client.get('/contacts/list/') - self.assertTemplateUsed(response, 'contacts/contacts.html') + self.assertTemplateUsed(response, 'contacts.html') def test_contacts_create(self): response = self.client.post('/contacts/create/', { @@ -59,7 +59,7 @@ class ContactViewsTestCase(ContactObjectsCreation, TestCase): response = self.client.post('/contacts/create/', { 'name': 'contact', 'email': 'contact@gmail.com', 'phone': '12345', 'account': self.account.id, 'address': self.address, 'description': 'contact'}) - self.assertTemplateUsed(response, 'contacts/create_contact.html') + self.assertTemplateUsed(response, 'create_contact.html') def test_contacts_delete(self): Contact.objects.filter(id=self.contact.id).delete() @@ -80,7 +80,7 @@ class ContactViewsTestCase(ContactObjectsCreation, TestCase): response = self.client.post('/contacts/'+ str(self.contact.id) +'/edit/', { 'name': 'priya', 'email': 'contact@gmail.com', 'phone': '12345', 'pk': self.contact.id, 'account': self.account.id, 'address': self.address.id}) - self.assertTemplateUsed(response, 'contacts/create_contact.html') + self.assertTemplateUsed(response, 'create_contact.html') def test_contacts_view(self): response = self.client.get('/contacts/'+ str(self.contact.id) +'/view/') @@ -89,6 +89,6 @@ class ContactViewsTestCase(ContactObjectsCreation, TestCase): def test_contacts_view_html(self): response = self.client.get('/contacts/'+ str(self.contact.id) +'/view/') - self.assertTemplateUsed(response, 'contacts/view_contact.html') + self.assertTemplateUsed(response, 'view_contact.html') diff --git a/contacts/views.py b/contacts/views.py index 728e51a6..004b1fd0 100644 --- a/contacts/views.py +++ b/contacts/views.py @@ -35,7 +35,7 @@ def contacts_list(request): contact_obj_list = contact_obj_list.filter(phone__icontains=phone) if email: contact_obj_list = contact_obj_list.filter(email__icontains=email) - return render(request, 'contacts/contacts.html', { + return render(request, 'contacts.html', { 'contact_obj_list': contact_obj_list, 'accounts': accounts, 'per_page': page @@ -71,7 +71,7 @@ def add_contact(request): else: if request.is_ajax(): return JsonResponse({'error': True, 'contact_errors': form.errors}) - return render(request, 'contacts/create_contact.html', { + return render(request, 'create_contact.html', { 'contact_form': form, 'address_form': address_form, 'accounts': accounts, @@ -82,7 +82,7 @@ def add_contact(request): 'teams_list': teams_list }) else: - return render(request, 'contacts/create_contact.html', { + return render(request, 'create_contact.html', { 'contact_form': form, 'address_form': address_form, 'accounts': accounts, @@ -99,7 +99,7 @@ def view_contact(request, contact_id): contact_record = get_object_or_404( Contact.objects.select_related("address"), id=contact_id) comments = contact_record.contact_comments.all() - return render(request, 'contacts/view_contact.html', { + return render(request, 'view_contact.html', { 'contact_record': contact_record, 'comments': comments}) @@ -134,7 +134,7 @@ def edit_contact(request, pk): else: if request.is_ajax(): return JsonResponse({'error': True, 'contact_errors': form.errors}) - return render(request, 'contacts/create_contact.html', { + return render(request, 'create_contact.html', { 'contact_form': form, 'address_form': address_form, 'contact_obj': contact_obj, @@ -146,7 +146,7 @@ def edit_contact(request, pk): 'teams_list': teams_list }) else: - return render(request, 'contacts/create_contact.html', { + return render(request, 'create_contact.html', { 'contact_form': form, 'address_form': address_form, 'contact_obj': contact_obj, @@ -239,6 +239,6 @@ def remove_comment(request): def get_contacts(request): if request.method == 'GET': contacts = Contact.objects.filter() - return render(request, 'contacts/contacts_list.html', {'contacts': contacts}) + return render(request, 'contacts_list.html', {'contacts': contacts}) else: return HttpResponse('Invalid Method or Not Authanticated in load_calls') diff --git a/emails/templates/create_mail.html b/emails/templates/create_mail.html new file mode 100644 index 00000000..c8f8250f --- /dev/null +++ b/emails/templates/create_mail.html @@ -0,0 +1,163 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} + + +
      + + + + +
      +
      +
      +
      +
      + Compose email +
      +
      +
      +
      +
      +
      + + + +
      + {{ form.from_email.errors }} +
      +
      +
      + + +
      +
      +
      +
      + + +
      + {{ form.to_email.errors }} +
      +
      +
      + + +
      +
      +
      +
      + + +
      + {{ form.subject.errors }} +
      +
      +
      +
      +
      + +
      +
      + +
      + +
      + +
      +
      +
      +
      +
      +
      + + +
      +
      + +
      +
      + + +
      + {{ form.message.errors }} +
      + +
      +
      +
      +
      +
      +
      +
      +
      + + +
      +
      + + +
      +
      + +
      +
      +
      + + + + {% endblock %} + + + + + + + {% block js_block %} + + {% endblock js_block %} + + \ No newline at end of file diff --git a/emails/templates/emails.html b/emails/templates/emails.html new file mode 100644 index 00000000..585d95f3 --- /dev/null +++ b/emails/templates/emails.html @@ -0,0 +1,154 @@ + + + + + + + + + + +
      + +
      + +
      + +
      + +
      + +
      + + + + + + + + + + +{% for sent in email_sent %} + + + + + + + + +{% endfor %} +
      TO : {{sent.to_email}}{{sent.subject}}{{sent.message}}{{sent.send_time}}{{sent.file}}delete
      + + +{% for trash in email_trash %} + + + + + + + + +{% endfor %} +
      TO : {{trash.to_email}}{{trash.subject}}{{trash.message}}{{trash.send_time}}{{trash.file}}delete
      + + +{% for draft in email_draft %} + + + + + + + + +{% endfor %} +
      TO : {{draft.to_email}}{{draft.subject}}{{draft.message}}{{draft.send_time}}{{draft.file}}delete
      + + + + + + + diff --git a/emails/templates/mail_all.html b/emails/templates/mail_all.html new file mode 100644 index 00000000..db3daa69 --- /dev/null +++ b/emails/templates/mail_all.html @@ -0,0 +1,125 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block breadcrumb %} + + +
      + + +
      + {% include 'mail_center.html' %} +
      + + +
      + +
      +
      +
      + +
      +
      +
      + +
      + +
      +
      +
      + filters +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      + + +
      +
      +
      +
      +
      +
      +
      + + + + + + + + + + Total Mails :{{filter_list.count}} + + + + {% paginate 10 filter_list as filter_list %} + {% for fil in filter_list %} + + + + + + + + + {% endfor %} + +
      ToSubjectMessageDate SentStatus
      {{fil.to_email}}{{fil.subject}}{{fil.message|stringformat:".5s"}}{{fil.send_time}}{{fil.status}}
      + {% ifequal filter_list|length 0 %} +

      +
      No Mails Found
      +

      + {% else %} +
      + +
      + {%endifequal%} +
      +
      + +
      +
      +
      +
      + + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} + + \ No newline at end of file diff --git a/emails/templates/mail_center.html b/emails/templates/mail_center.html new file mode 100644 index 00000000..7072646d --- /dev/null +++ b/emails/templates/mail_center.html @@ -0,0 +1,260 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} + +
      + + +
      +
      Mail Center
      +
      +
      +
      +
      +
      + + +
      + +
      + +
      +
      +
      +
      +
      + + + +
      +
      +
      +
      + +
      +
      + + + + +{% endblock %} + +{% block js_block %} + + + + +{% endblock %} \ No newline at end of file diff --git a/emails/templates/mail_drafts.html b/emails/templates/mail_drafts.html new file mode 100644 index 00000000..668dbb62 --- /dev/null +++ b/emails/templates/mail_drafts.html @@ -0,0 +1,133 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block breadcrumb %} + +
      + + +
      + {% include 'mail_center.html' %} +
      + + +
      + +
      +
      +
      + +
      +
      +
      + +
      + +
      +
      +
      + filters +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      + + + + + + + + + + Total Drafts : {{filter_list.count}} + + + + {% paginate 10 filter_list as filter_list %} + {% for draft in filter_list %} + + + + + + + + + + {% endfor %} + +
      ToSubjectMessageDate SentStatus
      {{draft.to_email}}{{draft.subject}}{{draft.message|stringformat:".5s"}}{{draft.send_time}}{{draft.status}} + +
      + {% ifequal filter_list|length 0 %} +

      +
      No Mails Found
      +

      + {% else %} +
      + +
      + {%endifequal%} +
      +
      +
      +
      +
      +
      + +
      +{% endblock %} +{% block js_block %} + +{% endblock js_block %} \ No newline at end of file diff --git a/emails/templates/mail_important.html b/emails/templates/mail_important.html new file mode 100644 index 00000000..cd3c0f21 --- /dev/null +++ b/emails/templates/mail_important.html @@ -0,0 +1,133 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block breadcrumb %} + +
      + + +
      + {% include 'mail_center.html' %} +
      + + +
      + +
      +
      +
      + +
      +
      +
      + +
      +
      +
      +
      + filters +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      + + +
      +
      +
      +
      + +
      +
      + + + + + + + + + + + Total Mails : {{filter_list.count}} + + + + {% paginate 10 filter_list as filter_list %} + {% for imp in filter_list %} + + + + + + + + + + + {% endfor %} + +
      ToSubjectMessageDate SentStatusimportant
      {{imp.to_email}}{{imp.subject}}{{imp.message|stringformat:".5s"}}{{imp.send_time}}{{imp.status}}{{imp.important}} + +
      + {% ifequal filter_list|length 0 %} +

      +
      No Mails Found
      +

      + {% else %} +
      + +
      + {%endifequal%} +
      +
      +
      +
      +
      +
      + +
      + {% endblock %} + {% block js_block %} + +{% endblock js_block %} + + \ No newline at end of file diff --git a/emails/templates/mail_sent.html b/emails/templates/mail_sent.html new file mode 100644 index 00000000..b6ed9855 --- /dev/null +++ b/emails/templates/mail_sent.html @@ -0,0 +1,136 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block breadcrumb %} + +
      + + +
      + {% include 'mail_center.html' %} +
      + + +
      + +
      +
      +
      + +
      +
      +
      + + +
      +
      +
      +
      + filters +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      + + +
      +
      +
      +
      +
      + +
      +
      + + + + + + + + + + Total Sent Mails : {{filter_list.count}} + + + + {% paginate 10 filter_list as filter_list %} + {% for sent in filter_list %} + + + + + + + + + {% endfor %} + +
      TOSubjectMessageDate SentStatus
      {{sent.to_email}}{{sent.subject}}{{sent.message|stringformat:".5s"}}{{sent.send_time}}{{sent.status}} + +
      + {% ifequal filter_list|length 0 %} +

      +
      No Mails Found
      +

      + {% else %} +
      + +
      + {%endifequal%} +
      +
      +
      +
      +
      +
      + + + {% endblock %} + {% block js_block %} + +{% endblock js_block %} + + + \ No newline at end of file diff --git a/emails/templates/mail_trash.html b/emails/templates/mail_trash.html new file mode 100644 index 00000000..4f73b6b7 --- /dev/null +++ b/emails/templates/mail_trash.html @@ -0,0 +1,132 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block breadcrumb %} + +
      + + +
      + {% include 'mail_center.html' %} +
      + +
      + +
      +
      +
      + +
      +
      +
      + +
      + +
      +
      +
      + filters +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      + + + + + + + + + Total Trash : {{filter_list.count}} + + + + {% paginate 10 filter_list as filter_list %} + {% for trash in filter_list %} + + + + + + + + + {% endfor %} + +
      TOSubjectMessageDate SentStatus
      {{trash.to_email}}{{trash.subject}}{{trash.message|stringformat:".5s"}}{{trash.send_time}}{{trash.status}} + +
      + {% ifequal filter_list|length 0 %} +

      +
      No Mails Found
      +

      + {% else %} +
      + +
      + {%endifequal%} +
      +
      +
      +
      +
      +
      + +
      + {% endblock %} + {% block js_block %} + +{% endblock js_block %} + + \ No newline at end of file diff --git a/emails/views.py b/emails/views.py index 59912f65..8e8757d1 100644 --- a/emails/views.py +++ b/emails/views.py @@ -23,7 +23,7 @@ def emails_list(request): if request.GET.get('name', ''): name = request.GET.get('name', '') filter_list = filter_list.filter(to_email__startswith=name) - return render(request, 'emails/mail_all.html', { + return render(request, 'mail_all.html', { 'filter_list': filter_list}) @@ -49,10 +49,10 @@ def email(request): f.save() return HttpResponseRedirect(reverse('emails:list')) else: - return render(request, 'emails/create_mail.html', {'form': form}) + return render(request, 'create_mail.html', {'form': form}) else: form = EmailForm() - return render(request, 'emails/create_mail.html', {'form': form}) + return render(request, 'create_mail.html', {'form': form}) def email_sent(request): @@ -69,7 +69,7 @@ def email_sent(request): if request.GET.get('name', ''): name = request.GET.get('name', '') filter_list = filter_list.filter(to_email__startswith=name) - return render(request, 'emails/mail_sent.html', + return render(request, 'mail_sent.html', {'filter_list': filter_list}) @@ -87,7 +87,7 @@ def email_trash(request): if request.GET.get('name', ''): name = request.GET.get('name', '') filter_list = filter_list.filter(to_email__startswith=name) - return render(request, 'emails/mail_trash.html', + return render(request, 'mail_trash.html', {'filter_list': filter_list}) @@ -110,7 +110,7 @@ def email_draft(request): if request.GET.get('name', ''): name = request.GET.get('name', '') filter_list = filter_list.filter(to_email__startswith=name) - return render(request, 'emails/mail_drafts.html', + return render(request, 'mail_drafts.html', {'filter_list': filter_list}) @@ -153,7 +153,7 @@ def email_imp_list(request): if request.GET.get('name', ''): name = request.GET.get('name', '') filter_list = filter_list.filter(to_email__startswith=name) - return render(request, 'emails/mail_important.html', {'filter_list': filter_list}) + return render(request, 'mail_important.html', {'filter_list': filter_list}) def email_sent_edit(request, pk): @@ -180,11 +180,11 @@ def email_sent_edit(request, pk): f.save() return HttpResponseRedirect(reverse('emails:list')) else: - return render(request, 'emails/create_mail.html', + return render(request, 'create_mail.html', {'form': form, 'em': em}) else: form = EmailForm() - return render(request, 'emails/create_mail.html', + return render(request, 'create_mail.html', {'form': form, 'em': em}) @@ -198,4 +198,4 @@ def email_unimp(request, pk): def email_view(request, pk): email_view = get_object_or_404(Email, pk=pk) x = EmailForm(instance=email_view) - return render(request, 'emails/create_mail.html', {'x': x}) + return render(request, 'create_mail.html', {'x': x}) diff --git a/leads/templates/checkbox.html b/leads/templates/checkbox.html new file mode 100644 index 00000000..4df20523 --- /dev/null +++ b/leads/templates/checkbox.html @@ -0,0 +1,453 @@ + +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} + +
      + + + + Account
      + Contact
      + Opportunity
      + + + + + + + + + +
      + +
      + + {% endblock %} + {# {% endblock %} #} + {% block js_block %} + + {% endblock js_block %} + + + + + diff --git a/leads/templates/create_lead.html b/leads/templates/create_lead.html new file mode 100644 index 00000000..aa6f7227 --- /dev/null +++ b/leads/templates/create_lead.html @@ -0,0 +1,169 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} +{% block extralinks %} + +{% endblock %} + + +{% endblock %} +{%block content%} +
      +
      +
      +
      + +
      +
      + CREATE LEAD +
      +
      +
      +
      +
      + +
      +
      + {{ lead_form.first_name }} + {{ lead_form.first_name.errors }} +
      +
      + {{ lead_form.last_name }} + {{ lead_form.last_name.errors }} +
      +
      +
      +
      +
      +
      + + {{ lead_form.account_name }} + {{ lead_form.account_name.errors }} +
      +
      +
      +
      + + {{ lead_form.title }} + {{ lead_form.title.errors }} +
      +
      +
      +
      + + {{ lead_form.phone }} + {{ lead_form.phone.errors }} +
      +
      +
      +
      + + {{ lead_form.email }} + {{ lead_form.email.errors }} +
      +
      +
      +
      + + {{ lead_form.website }} + {{ lead_form.website.errors }} +
      +
      +
      +
      +
      +
      + + + {{ lead_form.assigned_to.errors }} +
      +
      +
      +
      +
      + + {{ lead_form.status }} + {{ lead_form.status.errors }} +
      +
      +
      +
      + + {{ lead_form.source }} + {{ lead_form.source.errors }} +
      +
      +
      +
      + + {{ address_form.address_line }} + {{ address_form.address_line.errors }} +
      + {{ address_form.street }} + {{ address_form.street.errors }} +
      +
      + {{ address_form.city }} + {{ address_form.city.errors }} +
      +
      + {{ address_form.state }} + {{ address_form.state.errors }} +
      +
      + {{ address_form.postcode }} + {{ address_form.postcode.errors }} +
      +
      + {{ address_form.country }} + {{ address_form.country.errors }} +
      +
      +
      + +
      +
      +
      + + {{ lead_form.description }} + {{ lead_form.description.errors }} +
      +
      +
      +
      +
      +
      +
      + +
      +
      + + {% if not lead_obj %} + + {% endif %} + Cancel +
      +
      +{% endblock %} +{% block js_block %} + + +{% endblock js_block %} diff --git a/leads/templates/leads.html b/leads/templates/leads.html new file mode 100644 index 00000000..cd19bb95 --- /dev/null +++ b/leads/templates/leads.html @@ -0,0 +1,156 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load paginate %} +{% block content %} + +
      + +
      +
      +
      +
      +

      Leads

      +
      +
      + +
      +
      +
      +
      + + +
      +
      +
      + +
      +
      +
      Filters
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + Clear +
      +
      +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      + +
      +
      + List of Leads + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Leads {{ lead_obj|length }}{% endif %} +
      +
      + + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page lead_obj %} + {% else %} + {% paginate 10 lead_obj %} + {% endif %} + {% for lead in lead_obj %} + + + + + + + + + {% endfor %} + +
      S.noNameStatusAssigned UserCreated OnActions
      {{ forloop.counter }}{{ lead.first_name }} {{ lead.last_name }}{{ lead.status }} + {% with lead_users=lead.assigned_to.all %} + {% if lead_users %} + {% for user in lead_users %} +
    • {{ user.email }}
    • + {% endfor %} + {% else %} + Not Assigned to Any + {% endif %} + {% endwith %} +
      {{ lead.created_on }} + View + Edit + +
      +
      + {%ifequal lead_obj|length 0%} +
      No Lead Records Found
      + {%endifequal%} +
      + {% show_pages %} +
      +
      +
      +
      +
      +
      + + + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} diff --git a/leads/templates/leads_list.html b/leads/templates/leads_list.html new file mode 100644 index 00000000..92963e25 --- /dev/null +++ b/leads/templates/leads_list.html @@ -0,0 +1,38 @@ + + + + + + + + + {% ifequal leads|length 0 %} + + + + {% endifequal %} + {% for lead in leads %} + + + + + {% endfor %} + +
      + + Name + + + + + Email + +
      + NO LEADS FOUND!! +
      + + {{ lead.first_name }} + + + {{ lead.email }} +
      \ No newline at end of file diff --git a/leads/templates/view_leads.html b/leads/templates/view_leads.html new file mode 100644 index 00000000..93ec7840 --- /dev/null +++ b/leads/templates/view_leads.html @@ -0,0 +1,352 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} + + +{%endblock%} +{% block content %} +
      +
      +
      +
      + +
      +
      +
      + Overview + + + +
      +
      +
      +
      +
      +
      + +
      {{ lead_record.first_name }} {{ lead_record.last_name }}
      +
      +
      +
      + {% if lead_record.account_name %} +
      + +
      {{ lead_record.account_name }}
      +
      + {% endif %} +
      +
      + {% if lead_record.title %} +
      + +
      {{ lead_record.title }}
      +
      + {% endif %} +
      +
      +
      + +
      {{ lead_record.phone }}
      +
      +
      +
      +
      + +
      {{ lead_record.email }}
      +
      +
      +
      +
      +
      + {% if lead_record.status %} +
      + +
      {{ lead_record.status }}
      +
      + {% endif %} +
      +
      + {% if lead_record.source %} +
      + +
      {{ lead_record.source }}
      +
      + {% endif %} +
      +
      + {% if lead_record.website %} +
      + +
      {{ lead_record.website }}
      +
      + {% endif %} +
      +
      +
      + {% if lead_record.address.address_line or lead_record.address.street or lead_record.address.city or lead_record.address.state or lead_record.address.postcode or lead_record.address.country %} + +
      + {% if lead_record.address.address_line %} + Address Line:{{lead_record.address.address_line}}
      + {% endif %} + {% if lead_record.address.street %} + Street:{{ lead_record.address.street }}
      + {% endif %} + {% if lead_record.address.city %} + City: {{ lead_record.address.city }}
      + {% endif %} + {% if lead_record.address.state %} + State:{{ lead_record.address.state }}
      + {% endif %} + {% if lead_record.address.postcode %} + Post Code:{{ lead_record.address.postcode }}
      + {% endif %} + {% if lead_record.address.country %} + Country: {{ lead_record.address.get_country_display }} + {% endif %} +
      + {% endif %} +
      +
      +
      + {% if lead_record.description %} +
      + +
      {{ lead_record.description }}
      +
      + {% endif %} +
      +
      +
      +
      + + +
      +
      +
      Comments
      +
      +
      +
      +
      +
      + +
      +
      + +
      +
      + +
      +
        + {% for comment in comments %} +
      • +
        +
        + + +
        +
        +
        {{ comment.comment }}
        +
        +
        {{ comment.commented_by }}
        +
        {{ comment.commented_on }}
        +
        +
      • + {% endfor %} +
      +
      +
      + +
      + +
      +
      + +
      +
      + +
      +
      +
      Label
      +
      +
      +
      +
      + {%if lead_record.assigned_to.all %} + +
      + {% for user in lead_record.assigned_to.all %} +
    • {{ user }}
    • + {% endfor %} +
      + {% endif %} +
      +
      + +
      +
      + +
      + {{lead_record.created_on}} +
      +
      +
      +
      +
      + +
      + {{lead_record.created_by}} +
      +
      +
      +
      +
      +
      +
      +
      +
      +{% endblock %} +{% block js_block %} + + + +{% endblock js_block %} diff --git a/leads/tests.py b/leads/tests.py index 079e54cf..a5e23841 100644 --- a/leads/tests.py +++ b/leads/tests.py @@ -79,7 +79,7 @@ class LeadsPostrequestTestCase(TestLeadModel, TestCase): def test_leads_list_html(self): response = self.client.get('/leads/list/') - self.assertTemplateUsed(response, 'leads/leads.html') + self.assertTemplateUsed(response, 'leads.html') class LeadsCreateUrlTestCase(TestLeadModel, TestCase): @@ -103,7 +103,7 @@ class LeadsCreateUrlTestCase(TestLeadModel, TestCase): 'title': 'LeadCreation', 'name': "kotha", 'email': "anjalikotha1993@gmail.com", 'account': self.account, 'address': self.address, 'website': "www.gmail.com", 'status': "assigned", "source": "Call", 'opportunity_amount': "700", 'description': "Iam an Lead", 'created_by': self.user}) - self.assertTemplateUsed(response, 'leads/create_lead.html') + self.assertTemplateUsed(response, 'create_lead.html') class LeadsEditTestCase(TestLeadModel, TestCase): diff --git a/leads/views.py b/leads/views.py index 72d86d50..38c06462 100644 --- a/leads/views.py +++ b/leads/views.py @@ -38,7 +38,7 @@ def leads_list(request): if email: lead_obj = lead_obj.filter(email__icontains=email) - return render(request, 'leads/leads.html', { + return render(request, 'leads.html', { 'lead_obj': lead_obj, 'per_page': page}) @@ -80,14 +80,14 @@ def add_lead(request): else: return HttpResponseRedirect(reverse('leads:list')) else: - return render(request, 'leads/create_lead.html', { + return render(request, 'create_lead.html', { 'lead_form': form, 'address_form': address_form, 'accounts': accounts, 'countries': COUNTRIES, 'teams': teams, 'users': users, 'status': LEAD_STATUS, 'source': LEAD_SOURCE, 'assignedto_list': [int(user_id) for user_id in assignedto_list], 'teams_list': teams_list}) else: - return render(request, 'leads/create_lead.html', { + return render(request, 'create_lead.html', { 'lead_form': form, 'address_form': address_form, 'accounts': accounts, 'countries': COUNTRIES, 'teams': teams, 'users': users, 'status': LEAD_STATUS, 'source': LEAD_SOURCE, @@ -109,7 +109,7 @@ def view_lead(request, lead_id): 'form-MAX_NUM_FORMS': '10', } reminder_form_set = RemindersFormSet(data) - return render(request, "leads/view_leads.html", { + return render(request, "view_leads.html", { "lead_record": lead_record, 'status': LEAD_STATUS, 'countries': COUNTRIES, 'comments': comments, 'reminder_form_set': reminder_form_set, 'meetings': meetings, 'calls': calls @@ -159,7 +159,7 @@ def edit_lead(request, lead_id): account_object.save() return HttpResponseRedirect(reverse('leads:list')) else: - return render(request, 'leads/create_lead.html', { + return render(request, 'create_lead.html', { 'lead_obj': lead_obj, 'lead_form': form, 'address_form': address_form, @@ -168,7 +168,7 @@ def edit_lead(request, lead_id): 'status': LEAD_STATUS, 'source': LEAD_SOURCE, 'assignedto_list': [int(user_id) for user_id in assignedto_list], 'teams_list': teams_list}) else: - return render(request, 'leads/create_lead.html', { + return render(request, 'create_lead.html', { 'lead_form': form, 'address_form': address_form, 'lead_obj': lead_obj, 'address_obj': address_obj, 'accounts': accounts, 'countries': COUNTRIES, 'teams': teams, @@ -222,7 +222,7 @@ def leads_convert(request, pk): country1 = request.POST.get('country') shipdata = {'street1': street1, 'city1': city1, 'state1': state1, 'postcode1': postcode1, 'country1': country1} - return render(request, 'leads/checkbox.html', { + return render(request, 'checkbox.html', { 'account_form': account_form, 'form1': billing_form, 'form2': shipping_form, 'form5': COUNTRIES, 'stages': STAGES, 'acc_error': account_form.errors, 'shipdata': shipdata, 'sources': LEAD_SOURCE, 'industries': INDCHOICES, @@ -241,7 +241,7 @@ def leads_convert(request, pk): contact_obj.save() return HttpResponseRedirect(reverse('contacts:list')) else: - return render(request, 'leads/checkbox.html', { + return render(request, 'checkbox.html', { 'post': lead_obj, 'accounts': accounts, 'teams': teams, 'contact_form': contact_form, 'address_form': address_form}) if request.POST.get('opportunityname') == "on": @@ -250,11 +250,11 @@ def leads_convert(request, pk): opportunity_form.save() return HttpResponseRedirect(reverse('opportunities:list')) else: - return render(request, 'leads/checkbox.html', { + return render(request, 'checkbox.html', { 'post': lead_obj, 'accounts': accounts, 'sources': LEAD_SOURCE, 'teams': teams, 'stages': STAGES, 'opportunity_form': opportunity_form}) else: - return render(request, 'leads/checkbox.html', { + return render(request, 'checkbox.html', { 'form': account_form, 'form1': billing_form, 'form2': shipping_form, 'form5': COUNTRIES, 'industries': INDCHOICES, 'teams': teams, 'task': lead_objects, 'counties': COUNTRIES, @@ -333,6 +333,6 @@ def remove_comment(request): def get_leads(request): if request.method == 'GET': leads = Lead.objects.all() - return render(request, 'leads/leads_list.html', {'leads': leads}) + return render(request, 'leads_list.html', {'leads': leads}) else: return HttpResponse('Invalid Method or No Authanticated in load_calls') diff --git a/opportunity/templates/create_opportunity.html b/opportunity/templates/create_opportunity.html new file mode 100644 index 00000000..042c90f2 --- /dev/null +++ b/opportunity/templates/create_opportunity.html @@ -0,0 +1,279 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb %} +{% block extralinks %} + +{% endblock %} + +{% endblock %} +{% block content %} +
      +
      +
      +
      +
      +
      + CREATE OPPORTUNITY +
      +
      +
      +
      +
      + + {{ opportunity_form.name }} + {{opportunity_form.name.errors}} +
      +
      +
      +
      + + {{ opportunity_form.account }} + {{opportunity_form.account.errors}} +
      +
      +
      +
      + +
      +
      + {{ opportunity_form.currency }} + {{opportunity_form.currency.errors}} +
      + {{ opportunity_form.amount }} + {{opportunity_form.amount.errors}} +
      +
      +
      +
      +
      + + {{ opportunity_form.stage }} + {{opportunity_form.stage.errors}} +
      +
      +
      +
      + + {{ opportunity_form.lead_source }} + {{opportunity_form.lead_source.errors}} +
      +
      +
      +
      + + {{ opportunity_form.probability }} + {{opportunity_form.probability.errors}} +
      +
      +
      +
      +
      +
      + + +
      +
      +
      +
      +
      + + {{ opportunity_form.contacts }} + {{opportunity_form.contacts.errors}} +
      +
      +
      +
      + +
      + {{ opportunity_form.closed_on }} + + + +
      + {{opportunity_form.closed_on.errors}} +
      +
      +
      + + {{ opportunity_form.description }} + {{opportunity_form.description.errors}} +
      +
      +
      +
      + +
      + +
      + + {% if not opportunity_obj %} + + {% endif %} + Cancel +
      +
      +
      +
      +
      +{% endblock %} +{% block js_block %} + + +{% endblock js_block %} diff --git a/opportunity/templates/opp_contacts.html b/opportunity/templates/opp_contacts.html new file mode 100644 index 00000000..659ba551 --- /dev/null +++ b/opportunity/templates/opp_contacts.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/opportunity/templates/opportunities_list.html b/opportunity/templates/opportunities_list.html new file mode 100644 index 00000000..c23f8cec --- /dev/null +++ b/opportunity/templates/opportunities_list.html @@ -0,0 +1,38 @@ + + + + + + + + + {% ifequal opportunities|length 0 %} + + + + {% endifequal %} + {% for opportunity in opportunities %} + + + + + {% endfor %} + +
      + + Name + + + + + Stage + +
      + NO OPPORTUNITIES FOUND!! +
      + + {{ opportunity.name }} + + + {{ opportunity.stage }} +
      diff --git a/opportunity/templates/opportunity.html b/opportunity/templates/opportunity.html new file mode 100644 index 00000000..203e4e9d --- /dev/null +++ b/opportunity/templates/opportunity.html @@ -0,0 +1,179 @@ +{% extends "base.html" %} +{% load staticfiles %} +{% load paginate %} +{% block content %} + +
      + +
      +
      +
      +
      +

      Opportunities

      +
      + +
      +
      +
      + + +
      +
      +
      +
      +
      +
      Filters
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + Clear +
      +
      +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      + +
      +
      + List of Opportunities + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Opportunities {{ opportunity_list|length }}{% endif %} +
      +
      + + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page opportunity_list %} + {% else %} + {% paginate 10 opportunity_list %} + {% endif %} + {% for opportunity in opportunity_list %} + + + + + + + + + + {% endfor %} + +
      S.NoNameAccountContact(s)StageLead SourceActions
      {{ forloop.counter }}{{ opportunity.name }} + {% if opportunity.account %} + {{ opportunity.account }} + {% else %} + No Related Account + {% endif %} + + {% with opp_contacts=opportunity.contacts.all %} + {% if opp_contacts %} + {% for contact in opp_contacts %} +
    • {{contact.first_name}} {{contact.last_name}}
    • + {% endfor %} + {% else %} + No Related Contact + {% endif %} + {% endwith %} +
      {% if opportunity.stage %}{{ opportunity.stage }}{% else %}Not Specified {% endif %}{% if opportunity.lead_source %}{{ opportunity.lead_source }}{% else %}Not Specified{% endif %} + View + Edit + +
      +
      + {% ifequal opportunity_list|length 0 %} +
      No Opportunity Records Found
      + {% endifequal %} +
      + {% show_pages %} +
      +
      + +
      +
      +
      +
      + +
      + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} diff --git a/opportunity/templates/opportunity_comments.html b/opportunity/templates/opportunity_comments.html new file mode 100644 index 00000000..33b3dd03 --- /dev/null +++ b/opportunity/templates/opportunity_comments.html @@ -0,0 +1,17 @@ +{% for comment in comments %} +
    • +
      +
      + + +
      +
      +
      {{comment.comment_person}} Commented
      +
      {{comment.comment}}
      +
      {{comment.comment_time}}
      + {% endfor %} diff --git a/opportunity/templates/view_opportunity.html b/opportunity/templates/view_opportunity.html new file mode 100644 index 00000000..8bdb62d7 --- /dev/null +++ b/opportunity/templates/view_opportunity.html @@ -0,0 +1,339 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block breadcrumb1 %} + + + +{% endblock%} +{% block content%} + +
      +
      +
      +
      + +
      +
      +
      + OVERVIEW + + + +
      +
      +
      +
      +
      +
      + +
      {{ opportunity_record.name }}
      +
      +
      +
      +
      + +
      {{ opportunity_record.account }}
      +
      +
      +
      + {% if opportunity_record.contacts.all %} +
      + +
      + {% for contact in opportunity_record.contacts.all %} +
    • {{ contact }}
    • + {% endfor %} + + + {% endif %} + +
      + {% if opportunity_record.amount %} +
      + +
      {{ opportunity_record.currency }} {{ opportunity_record.amount }}
      +
      + {% endif %} +
      + +
      +
      + {% if opportunity_record.stage %} +
      + +
      {{ opportunity_record.stage }}
      +
      + {% endif %} +
      +
      + {% if opportunity_record.lead_source %} +
      + +
      {{ opportunity_record.lead_source }}
      +
      + {% endif %} +
      +
      + {% if opportunity_record.probability %} +
      + +
      {{opportunity_record.probability}} %
      +
      + {% endif %} +
      +
      +
      + +
      {{opportunity_record.closed_on|date}}
      +
      +
      +
      +
      +
      + {% if opportunity_record.description %} +
      + +
      {{opportunity_record.description}}
      +
      + {% endif %} +
      +
      + + + + +
      +
      +
      Comments
      +
      +
      +
      +
      +
      + +
      +
      + +
      +
      + +
      +
        + {% for comment in comments %} +
      • +
        +
        + + +
        +
        +
        {{ comment.comment }}
        +
        +
        {{ comment.commented_by }}
        +
        {{ comment.commented_on }}
        +
        +
      • + {% endfor %} +
      +
      +
      + +
      + + + +
      +
      + +
      +
      +
      Label
      +
      +
      +
      +
      + {%if opportunity_record.assigned_to.all %} + +
      + {% for user in opportunity_record.assigned_to.all %} +
    • {{ user }}
    • + {% endfor %} +
      + {% endif %} +
      +
      + +
      +
      + +
      {{opportunity_record.created_on}}
      +
      +
      +
      +
      + +
      {{opportunity_record.created_by}}
      +
      +
      +
      +
      +
      +
      + + + +{% endblock %} +{% block js_block %} + +{% endblock js_block %} diff --git a/opportunity/views.py b/opportunity/views.py index 0b88964c..56bd2b53 100644 --- a/opportunity/views.py +++ b/opportunity/views.py @@ -35,7 +35,7 @@ def opp_list(request): opportunity_list = opportunity_list.filter(account=opp_account) if opp_contact: opportunity_list = opportunity_list.filter(contacts=opp_contact) - return render(request, "opportunity/opportunity.html", { + return render(request, "opportunity.html", { 'opportunity_list': opportunity_list, 'accounts': accounts, 'contacts': contacts, @@ -75,7 +75,7 @@ def opp_create(request): else: if request.is_ajax(): return JsonResponse({'error': True, 'opportunity_errors': form.errors}) - return render(request, 'opportunity/create_opportunity.html', { + return render(request, 'create_opportunity.html', { 'opportunity_form': form, 'accounts': accounts, 'users': users, @@ -88,7 +88,7 @@ def opp_create(request): 'contacts_list': contacts_list }) else: - return render(request, 'opportunity/create_opportunity.html', { + return render(request, 'create_opportunity.html', { 'opportunity_form': form, 'accounts': accounts, 'users': users, @@ -107,7 +107,7 @@ def opp_view(request, pk): opportunity_record = get_object_or_404( Opportunity.objects.prefetch_related("contacts", "account"), id=pk) comments = opportunity_record.opportunity_comments.all() - return render(request, 'opportunity/view_opportunity.html', { + return render(request, 'view_opportunity.html', { 'opportunity_record': opportunity_record, 'comments': comments }) @@ -148,7 +148,7 @@ def opp_edit(request, pk): else: if request.is_ajax(): return JsonResponse({'error': True, 'opportunity_errors': form.errors}) - return render(request, 'opportunity/create_opportunity.html', { + return render(request, 'create_opportunity.html', { 'opportunity_form': form, 'opportunity_obj': opportunity_obj, 'accounts': accounts, @@ -162,7 +162,7 @@ def opp_edit(request, pk): 'contacts_list': contacts_list }) else: - return render(request, 'opportunity/create_opportunity.html', { + return render(request, 'create_opportunity.html', { 'opportunity_form': form, 'opportunity_obj': opportunity_obj, 'accounts': accounts, @@ -267,6 +267,6 @@ def remove_comment(request): def get_opportunity(request): if request.method == 'GET': opportunities = Opportunity.objects.all() - return render(request, 'opportunity/opportunities_list.html', {'opportunities': opportunities}) + return render(request, 'opportunities_list.html', {'opportunities': opportunities}) else: return HttpResponse('Invalid Method or Not Authanticated in load_calls') diff --git a/planner/templates/calls.html b/planner/templates/calls.html new file mode 100644 index 00000000..6e742336 --- /dev/null +++ b/planner/templates/calls.html @@ -0,0 +1,614 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block content %} + +
      +
      CALLS
      +
      +
      +
      +
      +
      + +
      + +
      +
      + +
      +
      + + + + + + + +    + + + + + +
      +
      +
      + + + + +    + + + + +
      +
      + +
      +
      +
      + + + + +    + + + + + + + +
      + +
      +
      + + + +   + + + +
      + +
      + + + +   + + + + +
      + + +
      + + + +   + + + +
      + +
      + + + + +    + + + + +
      +
      +
      +
      + + + + + + + + + +
      +
      + + +
      +
      + + + + +
      +
      + + + + +
      +
      + +
      +
      +
      + {# #} + + +
      +
      +
      +
      +
      + +
      + Create Call +
      +
      + + +
      +
      +
      +
      + filters +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + + +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + {% include 'planner/calls_list.html' %} +
      + +
      + +
      + + + + +
      + + +
      +
      + + + + + + {% include 'planner/dialog_models.html' %} + + +{% endblock %} diff --git a/planner/templates/calls_list.html b/planner/templates/calls_list.html new file mode 100644 index 00000000..3df75b9f --- /dev/null +++ b/planner/templates/calls_list.html @@ -0,0 +1,61 @@ +{% load staticfiles %} + + + + + + + + + + + {% for call in calls %} + + + + + + + + + {% endfor %} + +
      NameParentStatusDate StartActions
      {{ call.name }}{{ call.parent }}{{ call.status }}{{ call.start_date }} + +
      +{% if calls|length == 0 %} +
      No Calls found
      +{% endif %} +
      + +
      + \ No newline at end of file diff --git a/planner/templates/contacts.html b/planner/templates/contacts.html new file mode 100644 index 00000000..ab01f19d --- /dev/null +++ b/planner/templates/contacts.html @@ -0,0 +1,63 @@ + + + + + + + + + + {% ifequal contacts|length 0 %} + + + + {% endifequal %} + {% for contact in contacts %} + + + + + + {% endfor %} + +
      + + + Name + + + + + Email + +
      + NO CONTACTS FOUND!! +
      + + + {{ contact.name }} + + {{ contact.email }} +
      +
      + +
      + \ No newline at end of file diff --git a/planner/templates/dialog_models.html b/planner/templates/dialog_models.html new file mode 100644 index 00000000..50ddc5ac --- /dev/null +++ b/planner/templates/dialog_models.html @@ -0,0 +1,108 @@ +{% load staticfiles %} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/planner/templates/events_base.html b/planner/templates/events_base.html new file mode 100644 index 00000000..88bc72f0 --- /dev/null +++ b/planner/templates/events_base.html @@ -0,0 +1,164 @@ + +
      +
      Contacts
      +
      +
      +
      +
      +
      + + +
      + +
      + +
      +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      + {% block addnew %}{% endblock %} +
      +
      + + +
      +
      +
      +
      + filters +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + + +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + {% block eventcount %}{% endblock %} +
      +
      + + {% block eventslist %}{% endblock %} + +
      +
      +
      +
      +
      + + + + diff --git a/planner/templates/leads.html b/planner/templates/leads.html new file mode 100644 index 00000000..046b55f1 --- /dev/null +++ b/planner/templates/leads.html @@ -0,0 +1,63 @@ + + + + + + + + + + {% ifequal leads|length 0 %} + + + + {% endifequal %} + {% for lead in leads %} + + + + + + {% endfor %} + +
      + + + Name + + + + + Email + +
      + NO LEADS FOUND!! +
      + + + {{ lead.first_name }} + + {{ lead.email }} +
      +
      + +
      + diff --git a/planner/templates/meetings.html b/planner/templates/meetings.html new file mode 100644 index 00000000..3bb4f515 --- /dev/null +++ b/planner/templates/meetings.html @@ -0,0 +1,549 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block content %} + +
      +
      MEETINGS
      +
      +
      +
      +
      +
      + +
      + +
      +
      + +
      +
      + + + + + + + +    + + + + + +
      +
      +
      + + + + +    + + + + +
      +
      + +
      +
      +
      + + + + +    + + + + +
      + +
      +
      +
      + + + +   + + + +
      + +
      + + + +   + + + + +
      + + +
      + + + +   + + + +
      + +
      + + + + +    + + + + +
      +
      +
      +
      + + + + + + + + + +
      +
      + + +
      +
      + + + + +
      +
      + + + + +
      +
      + +
      +
      +
      + {# #} + + +
      +
      +
      +
      +
      +
      + Create Meeting +
      + +
      + + +
      +
      +
      +
      + {% include 'planner/meetings_list.html' %} +
      + +
      + +
      +
      + + + + + + +
      +
      + + + + + + {% include 'planner/dialog_models.html' %} + + +{% endblock %} diff --git a/planner/templates/meetings_list.html b/planner/templates/meetings_list.html new file mode 100644 index 00000000..97f7f9db --- /dev/null +++ b/planner/templates/meetings_list.html @@ -0,0 +1,81 @@ +{% load staticfiles %} + + + + + + + + + + + + + {% for meeting in meetings %} + + + + + + + + {% endfor %} + +
      NameParentStatusDate StartActions
      {{ meeting.name }}{{ meeting.parent }}{{ meeting.status }}{{ meeting.start_date }} + +
      +{% if meetings|length == 0 %} +
      No Meetings found
      +{% endif %} +
      + +
      + + \ No newline at end of file diff --git a/planner/templates/reminder.html b/planner/templates/reminder.html new file mode 100644 index 00000000..1c3126ed --- /dev/null +++ b/planner/templates/reminder.html @@ -0,0 +1,13 @@ +{% load staticfiles %} +
      + {{ reminder_form_set.management_form }} + {% for form in reminder_form_set %} +
      + {{ form.reminder_type }} + {{ form.reminder_time }} + {{ form.DELETE }} + {{ form.id }} +
      + {% endfor %} +
      + \ No newline at end of file diff --git a/planner/templates/tasks.html b/planner/templates/tasks.html new file mode 100644 index 00000000..67521d2c --- /dev/null +++ b/planner/templates/tasks.html @@ -0,0 +1,469 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block content %} + +
      +
      TASKS
      +
      +
      +
      +
      +
      + +
      + +
      +
      + +
      +
      + + + + + + + +    + + + + + +
      +
      +
      + + + + +    + + + + +
      +
      + +
      +
      + + + +   + + + +
      + +
      + + + +   + + + + +
      + +
      + + + +   + + + +
      + +
      + + + + + + + + + +
      +
      +
      +
      +
      + + + + +
      +
      + + + + +
      +
      + +
      +
      +
      + {# #} + + +
      +
      +
      +
      +
      + +
      + Create Task +
      +
      + + +
      +
      +
      +
      + filters +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + + +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + {% include 'planner/tasks_list.html' %} +
      + + +
      + +
      + +
      +
      +
      + + + + + + + + {% include 'planner/dialog_models.html' %} + + +{% endblock %} + diff --git a/planner/templates/tasks_list.html b/planner/templates/tasks_list.html new file mode 100644 index 00000000..819e472f --- /dev/null +++ b/planner/templates/tasks_list.html @@ -0,0 +1,65 @@ +{% load staticfiles %} + + + + + + + + + + + + + + {% for task in tasks %} + + + + + + + + + + {% endfor %} + + +
      NameStatusPriorityDate DueActions
      {{ task.name }}{{ task.status }}{{ task.priority }}{{ task.start_date }} + +
      +{% if tasks|length == 0 %} +
      No Tasks found
      +{% endif %} +
      + +
      + \ No newline at end of file diff --git a/planner/templates/users.html b/planner/templates/users.html new file mode 100644 index 00000000..0d65a966 --- /dev/null +++ b/planner/templates/users.html @@ -0,0 +1,64 @@ +{% load staticfiles %} + + + + + + + + + + {% ifequal users|length 0 %} + + + + {% endifequal %} + {% for user in users %} + + + + + + {% endfor %} + +
      + + + Name + + + + + Email + +
      + NO USERS FOUND!! +
      + + + {{ user.username }} + + {{ user.email }} +
      +
      + +
      + \ No newline at end of file diff --git a/planner/views.py b/planner/views.py index e2216de3..35ca6744 100644 --- a/planner/views.py +++ b/planner/views.py @@ -32,13 +32,13 @@ # paginator = Paginator(meetings, 5) # try: # meetings = paginator.page(request.GET.get('page')) -# return render(request, 'planner/meetings_list.html', +# return render(request, 'meetings_list.html', # {'meetings': meetings}) # except PageNotAnInteger: # meetings = paginator.page(1) # except EmptyPage: # meetings = paginator.page(paginator.num_pages) -# return render(request, 'planner/meetings.html', +# return render(request, 'meetings.html', # {'meetings': meetings, 'reminder_form_set': reminder_form_set}) # else: # return HttpResponse('Invalid Method or Not Authanticated in load_meetings') @@ -52,13 +52,13 @@ # paginator = Paginator(tasks, 3) # try: # tasks = paginator.page(request.GET.get('page')) -# return render(request, 'planner/tasks_list.html', +# return render(request, 'tasks_list.html', # {'tasks': tasks}) # except PageNotAnInteger: # tasks = paginator.page(1) # except EmptyPage: # tasks = paginator.page(paginator.num_pages) -# return render(request, 'planner/tasks.html', {'tasks': tasks}) +# return render(request, 'tasks.html', {'tasks': tasks}) # else: # return HttpResponse('Invalid Method or Not Authanticated in load_tasks') @@ -78,13 +78,13 @@ # paginator = Paginator(calls, 3) # try: # calls = paginator.page(request.GET.get('page')) -# return render(request, 'planner/calls_list.html', +# return render(request, 'calls_list.html', # {'calls': calls}) # except PageNotAnInteger: # calls = paginator.page(1) # except EmptyPage: # calls = paginator.page(paginator.num_pages) -# return render(request, 'planner/calls.html', {'calls': calls, 'reminder_form_set': reminder_form_set}) +# return render(request, 'calls.html', {'calls': calls, 'reminder_form_set': reminder_form_set}) # else: # return HttpResponse('Invalid Method or Not Authanticated in load_calls') @@ -222,7 +222,7 @@ # meeting = Event.objects.get(id=int(request.POST.get('meetingID')), created_user=request.user) # ReminderFormSet = modelformset_factory(Reminder, ReminderForm, can_delete=True, extra=0) # reminder_form_set = ReminderFormSet(queryset=meeting.reminders.all()) -# remindersHtML = render(request, 'planner/reminder.html', {'reminder_form_set': reminder_form_set}) +# remindersHtML = render(request, 'reminder.html', {'reminder_form_set': reminder_form_set}) # data = {} # if meeting.parent: # data['parent_type'] = meeting.parent.__class__.__name__ @@ -517,35 +517,35 @@ # if request.GET.get('event_type') == 'Meeting': # try: # event = paginator.page(request.GET.get('page')) -# return render(request, 'planner/meetings_list.html', +# return render(request, 'meetings_list.html', # {'meetings': event}) # except PageNotAnInteger: # event = paginator.page(1) # except EmptyPage: # event = paginator.page(paginator.num_pages) -# return render(request, 'planner/meetings_list.html', +# return render(request, 'meetings_list.html', # {'meetings': event}) # elif request.GET.get('event_type') == 'Call': # try: # event = paginator.page(request.GET.get('page')) -# return render(request, 'planner/calls_list.html', +# return render(request, 'calls_list.html', # {'calls': event}) # except PageNotAnInteger: # event = paginator.page(1) # except EmptyPage: # event = paginator.page(paginator.num_pages) -# return render(request, 'planner/calls_list.html', +# return render(request, 'calls_list.html', # {'calls': event}) # elif request.GET.get('event_type') == 'Task': # try: # event = paginator.page(request.GET.get('page')) -# return render(request, 'planner/tasks_list.html', +# return render(request, 'tasks_list.html', # {'tasks': event}) # except PageNotAnInteger: # event = paginator.page(1) # except EmptyPage: # event = paginator.page(paginator.num_pages) -# return render(request, 'planner/tasks_list.html', +# return render(request, 'tasks_list.html', # {'tasks': event}) # except models.Event.DoesNotExist: # return JsonResponse({'Event': 'DoesNotExist'}) @@ -563,7 +563,7 @@ # 'form-MAX_NUM_FORMS': '10', # } # reminder_form_set = RemindersFormSet(data) -# return render(request, 'planner/reminder.html', {'reminder_form_set': reminder_form_set}) +# return render(request, 'reminder.html', {'reminder_form_set': reminder_form_set}) # else: # return JsonResponse({'METHOD': 'INVALID'}) @@ -661,13 +661,13 @@ # paginator = Paginator(users, 5) # try: # users = paginator.page(request.GET.get('page')) -# return render(request, 'planner/users.html', +# return render(request, 'users.html', # {'users': users}) # except PageNotAnInteger: # users = paginator.page(1) # except EmptyPage: # users = paginator.page(paginator.num_pages) -# return render(request, 'planner/users.html', {'users': users}) +# return render(request, 'users.html', {'users': users}) # else: # return JsonResponse({'METHOD': 'INVALID'}) @@ -678,13 +678,13 @@ # paginator = Paginator(contacts, 5) # try: # contacts = paginator.page(request.GET.get('page')) -# return render(request, 'planner/contacts.html', +# return render(request, 'contacts.html', # {'contacts': contacts}) # except PageNotAnInteger: # contacts = paginator.page(1) # except EmptyPage: # contacts = paginator.page(paginator.num_pages) -# return render(request, 'planner/contacts.html', {'contacts': contacts}) +# return render(request, 'contacts.html', {'contacts': contacts}) # else: # return JsonResponse({'METHOD': 'INVALID'}) @@ -695,12 +695,12 @@ # paginator = Paginator(leads, 5) # try: # leads = paginator.page(request.GET.get('page')) -# return render(request, 'planner/leads.html', +# return render(request, 'leads.html', # {'leads': leads}) # except PageNotAnInteger: # leads = paginator.page(1) # except EmptyPage: # leads = paginator.page(paginator.num_pages) -# return render(request, 'planner/leads.html', {'leads': leads}) +# return render(request, 'leads.html', {'leads': leads}) # else: # return JsonResponse({'METHOD': 'INVALID'}) diff --git a/static/css/main.scss b/static/css/main.scss index c4f0ed91..c7d07c8a 100644 --- a/static/css/main.scss +++ b/static/css/main.scss @@ -385,20 +385,21 @@ $color_2: #000; .card-title{ background: #e5e5e5; padding:6px 10px; - font-size: 13px; - + font-weight: 600; + font-size: 1rem; } .form-group{ margin-bottom: 10px; label{ color: $text_color; - font-size: 12px; - font-weight: 500; + font-size: 1rem; + font-weight: 600; + text-transform: none; } .form-control{ border-radius: 0; box-shadow: none; - font-size: 12px; + font-size: 1rem; } } } @@ -415,9 +416,10 @@ $color_2: #000; .card-title{ padding:5px 10px; background: #e5e5e5; - padding:6px 10px; - font-size: 13px; + padding:6px 10px; + font-size: 1rem; margin-bottom: 0; + font-weight: 600; .dropdown{ display: inline-block; .dropdown-toggle{ @@ -453,9 +455,9 @@ $color_2: #000; th{ background: #5b646d; color: #fff; - font-weight: 500; + font-weight: 600; /* text-transform: uppercase; */ - font-size: 12px; + font-size: 1rem; border: none; padding:6px; } @@ -466,9 +468,12 @@ $color_2: #000; td{ vertical-align: middle; color: #454545; - font-size: 12px; - font-weight: 400; + font-size: 1rem; + font-weight: 500; padding:7px 0; + @media(min-width: $large){ + font-size:1rem; + } a{ color: #454545; } @@ -484,12 +489,13 @@ $color_2: #000; &.actions{ .btn{ border-radius: 0; - font-size: 12px; + font-size: 1rem; padding:3px 5px; color: #fff; svg{ display: inline-block; margin-right: 5px; + font-size: 0.85rem; } } } @@ -599,7 +605,7 @@ $color_2: #000; .form-control{ border-radius: 0; box-shadow: none; - font-size: 12px; + font-size: 1rem; } margin-top:0; .country_class{ @@ -639,7 +645,8 @@ $color_2: #000; margin-bottom: 20px; button{ border-radius: 0; - font-size: 12px; + font-size: 1rem; + font-weight: 600; &.save{ background: $dark_sky; color: #fff; @@ -680,19 +687,19 @@ $color_2: #000; .view-pad{ padding:0px !important; h5{ - width: 79%; + width: 90%; margin-bottom: 0; position: relative; - font-size: 13px; + font-size: 1rem; + font-weight: 600; display: inline-block; text-align: left; padding-top: 0px; } a{ float: right; - margin-right: 95px; border-radius: 0; - font-size: 12px; + font-size: 1rem; padding: 3px 10px; color: #fff; margin-top: -4px; @@ -702,3 +709,13 @@ padding:0px !important; } } + +.select2-container{ + width: 100% !important; + border-radius: 0; + border: 1px solid #ced4da; +} +.select2-container--default .select2-selection--multiple{ + border-radius: 0 important; + border: none !important; +} \ No newline at end of file diff --git a/static/css/ref.scss b/static/css/ref.scss index 1e2a49dd..76fe9353 100644 --- a/static/css/ref.scss +++ b/static/css/ref.scss @@ -36,7 +36,8 @@ $mob_min:240px; margin-top: 23px; button{ border-radius: 0; - font-size: 12px; + font-size: 1rem; + font-weight: 600; &.save{ background: $dark_sky; color: #fff; @@ -47,7 +48,7 @@ $mob_min:240px; border:1px solid $dark_sky; border-radius: 0; color: $dark_sky; - font-size: 12px; + font-size: 1rem; } &.form_btn_row{ display: block; @@ -58,7 +59,7 @@ $mob_min:240px; } select{ &.form-control{ - height: 32px !important; + height: 32px ; } }