From 0c8fd3408c56392d61a223284be43b8c03d4a614 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Nov 2013 14:55:45 +0530 Subject: [PATCH 1/8] [minor] [website] fix in container --- portal/templates/includes/transactions.html | 2 +- portal/templates/pages/cart.html | 2 +- portal/templates/pages/profile.html | 2 +- portal/templates/sale.html | 2 +- .../templates/generators/item_group.html | 4 ++-- .../templates/generators/partner.html | 2 +- .../templates/pages/partners.html | 2 +- .../item/templates/generators/item.html | 2 +- .../includes/product_breadcrumbs.html | 16 ++++++-------- .../templates/includes/product_in_list.html | 2 +- .../includes/product_search_box.html | 22 +++++++++---------- .../item/templates/pages/product_search.html | 2 +- .../templates/pages/ticket.html | 2 +- .../address/templates/pages/address.html | 2 +- .../address/templates/pages/addresses.html | 2 +- 15 files changed, 31 insertions(+), 35 deletions(-) diff --git a/portal/templates/includes/transactions.html b/portal/templates/includes/transactions.html index 036a77c181..6148f18fca 100644 --- a/portal/templates/includes/transactions.html +++ b/portal/templates/includes/transactions.html @@ -1,7 +1,7 @@ {% extends base_template %} {% block content -%} -
+
  • Home
  • {{ title }}
    • diff --git a/portal/templates/pages/cart.html b/portal/templates/pages/cart.html index 8b648e5cca..1abe46787c 100644 --- a/portal/templates/pages/cart.html +++ b/portal/templates/pages/cart.html @@ -7,7 +7,7 @@ {% set title="Shopping Cart" %} {% block content %} -
    +

    {{ title }}

    diff --git a/portal/templates/pages/profile.html b/portal/templates/pages/profile.html index fe9ded5097..a8077319c1 100644 --- a/portal/templates/pages/profile.html +++ b/portal/templates/pages/profile.html @@ -3,7 +3,7 @@ {% set title="My Profile" %} {% block content %} -
    +
    • Home
    • My Profile
      • diff --git a/portal/templates/sale.html b/portal/templates/sale.html index 2a7c6038da..5dc72c793b 100644 --- a/portal/templates/sale.html +++ b/portal/templates/sale.html @@ -3,7 +3,7 @@ {% set title=doc.name %} {% block content %} -
      +
      • Home
      • {{ parent_title }}
        • diff --git a/setup/doctype/item_group/templates/generators/item_group.html b/setup/doctype/item_group/templates/generators/item_group.html index ba32d5c95a..e80d0a22ad 100644 --- a/setup/doctype/item_group/templates/generators/item_group.html +++ b/setup/doctype/item_group/templates/generators/item_group.html @@ -3,7 +3,7 @@ {% block content %} {% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %} {% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %} -
        +
        {% if slideshow %} {% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %} {% endif %} @@ -13,7 +13,7 @@

        {{ name }}

        {% endif %}
        -
        +
        {% if sub_groups %}
        diff --git a/setup/doctype/sales_partner/templates/generators/partner.html b/setup/doctype/sales_partner/templates/generators/partner.html index eb1481b224..f0e43f0f15 100644 --- a/setup/doctype/sales_partner/templates/generators/partner.html +++ b/setup/doctype/sales_partner/templates/generators/partner.html @@ -1,7 +1,7 @@ {% extends base_template %} {% block content %} -
        +
        {% if logo -%} diff --git a/setup/doctype/sales_partner/templates/pages/partners.html b/setup/doctype/sales_partner/templates/pages/partners.html index 14c72ae87e..eabceb2855 100644 --- a/setup/doctype/sales_partner/templates/pages/partners.html +++ b/setup/doctype/sales_partner/templates/pages/partners.html @@ -3,7 +3,7 @@ {% set title="Partners" %} {% block content %} -
        +

        {{ title }}

        {% for partner_info in partners %} diff --git a/stock/doctype/item/templates/generators/item.html b/stock/doctype/item/templates/generators/item.html index a89eada41b..545693d0c7 100644 --- a/stock/doctype/item/templates/generators/item.html +++ b/stock/doctype/item/templates/generators/item.html @@ -24,7 +24,7 @@ {% block content %} {% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %} {% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %} -
        +
        {% if slideshow %} diff --git a/stock/doctype/item/templates/includes/product_breadcrumbs.html b/stock/doctype/item/templates/includes/product_breadcrumbs.html index f073e6f4df..e880364a6a 100644 --- a/stock/doctype/item/templates/includes/product_breadcrumbs.html +++ b/stock/doctype/item/templates/includes/product_breadcrumbs.html @@ -1,12 +1,10 @@ {% if obj.parent_groups and (obj.parent_groups|length) > 1 %} -
        -
        -
          - {% for ig in obj.parent_groups[:-1] %} -
        • {{ ig.name }}
          • - {% endfor %} -
        • {{ obj.parent_groups[-1].name }}
          • -
        -
        +
        +
          + {% for ig in obj.parent_groups[:-1] %} +
        • {{ ig.name }}
          • + {% endfor %} +
        • {{ obj.parent_groups[-1].name }}
          • +
        {% endif %} \ No newline at end of file diff --git a/stock/doctype/item/templates/includes/product_in_list.html b/stock/doctype/item/templates/includes/product_in_list.html index b3e5b86e29..c501283b89 100644 --- a/stock/doctype/item/templates/includes/product_in_list.html +++ b/stock/doctype/item/templates/includes/product_in_list.html @@ -1,5 +1,5 @@ -
        +
        {%- if website_image -%} diff --git a/stock/doctype/item/templates/includes/product_search_box.html b/stock/doctype/item/templates/includes/product_search_box.html index 00c001bd0c..0f44eea72e 100644 --- a/stock/doctype/item/templates/includes/product_search_box.html +++ b/stock/doctype/item/templates/includes/product_search_box.html @@ -1,15 +1,13 @@ -
        -
        -
        -
        - - - - -
        -
        -
        +
        +
        +
        + + + + +
        +
        {% include "app/stock/doctype/item/templates/includes/product_search_box.html" %} -
        +

        Search Results

        diff --git a/support/doctype/support_ticket/templates/pages/ticket.html b/support/doctype/support_ticket/templates/pages/ticket.html index 4b41dc21e9..1732e770cb 100644 --- a/support/doctype/support_ticket/templates/pages/ticket.html +++ b/support/doctype/support_ticket/templates/pages/ticket.html @@ -9,7 +9,7 @@ } %} {% block content %} -
        +
        • Home
        • My Tickets
          • diff --git a/utilities/doctype/address/templates/pages/address.html b/utilities/doctype/address/templates/pages/address.html index f02d687232..5eaefd5948 100644 --- a/utilities/doctype/address/templates/pages/address.html +++ b/utilities/doctype/address/templates/pages/address.html @@ -37,7 +37,7 @@ {%- endmacro %} {% block content %} -
          +
          • Home
          • My Addresses
            • diff --git a/utilities/doctype/address/templates/pages/addresses.html b/utilities/doctype/address/templates/pages/addresses.html index d56c734cb3..6fe36a97b4 100644 --- a/utilities/doctype/address/templates/pages/addresses.html +++ b/utilities/doctype/address/templates/pages/addresses.html @@ -3,7 +3,7 @@ {% set title="My Addresses" %} {% block content %} -
            +
            • Home
            • My Addresses
              • From b866a9bb053f0595a46ad5874fc704555667dc1f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Nov 2013 17:03:41 +0530 Subject: [PATCH 2/8] [minor] [website] footer fixes --- portal/templates/includes/footer.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/portal/templates/includes/footer.html b/portal/templates/includes/footer.html index 6963175d91..7cba9e3083 100644 --- a/portal/templates/includes/footer.html +++ b/portal/templates/includes/footer.html @@ -1,10 +1,9 @@ {% extends "lib/website/templates/includes/footer.html" %} -{% block powered %}ERPNext Powered{% endblock %} +{% block powered %}ERPNext Powered{% endblock %} {% block extension %} -
              -
              +
              From 6c294926529461d49c388bc5d19c28c2db39c275 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Nov 2013 18:28:03 +0530 Subject: [PATCH 3/8] [minor] [fix] first web page should set brand_html --- setup/doctype/company/company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index f31fddbfed..3b1670d4f2 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -80,7 +80,7 @@ class DocType: # update in home page in settings website_settings = webnotes.bean("Website Settings", "Website Settings") website_settings.doc.home_page = webpage.doc.name - website_settings.doc.banner_html = """

              """ + self.doc.name + "

              " + website_settings.doc.brand_html = "{}".format(self.doc.name) website_settings.doc.copyright = self.doc.name website_settings.doclist.append({ "doctype": "Top Bar Item", From 79c4d7c66273834196e49d630e74c525d9c25b90 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Nov 2013 18:28:25 +0530 Subject: [PATCH 4/8] [minor] [website] footer fixes --- portal/templates/includes/footer.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/portal/templates/includes/footer.html b/portal/templates/includes/footer.html index 7cba9e3083..cd75fd16f6 100644 --- a/portal/templates/includes/footer.html +++ b/portal/templates/includes/footer.html @@ -1,15 +1,18 @@ {% extends "lib/website/templates/includes/footer.html" %} -{% block powered %}ERPNext Powered{% endblock %} +{% block powered %}ERPNext Powered{% endblock %} {% block extension %} -
              - - - - +
              +
              +
              + + + + +
              +
              -