diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..0d20b6487 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py index cca428d29..102f7cd2b 100644 --- a/roundup/cgi/templating.py +++ b/roundup/cgi/templating.py @@ -762,9 +762,12 @@ def classhelp(self, properties=None, label=''"(list)", width='500', (help_url, onclick, cgi_escape_attrs(**html_kwargs), self._(label)) - def submit(self, label=''"Submit New Entry", action="new"): + def submit(self, label=''"Submit New Entry", action="new", html_kwargs={}): """ Generate a submit button (and action hidden element) + "html_kwargs" specified additional html args for the + generated html + Also sneak in the lastactivity and action hidden elements. """ return self.input(type="hidden", name="@lastactivity", @@ -919,7 +926,7 @@ def submit(self, label=''"Submit Changes", action="edit"): self.input(type="hidden", name="@action", value=action) + \ '\n' + \ self.input(type="submit", name="submit_button", - value=self._(label)) + value=self._(label), **html_kwargs) def journal(self, direction='descending'): """ Return a list of HTMLJournalEntry instances. diff --git a/share/roundup/templates/jinja2/html/issue.item.edit.html b/share/roundup/templates/jinja2/html/issue.item.edit.html index 9529d5272..146910fc0 100644 --- a/share/roundup/templates/jinja2/html/issue.item.edit.html +++ b/share/roundup/templates/jinja2/html/issue.item.edit.html @@ -1,97 +1,70 @@ -
-
- -
-
- -
- + +
+ +
+ +
+ +
-
-
- -
-
- -
- {{ context.priority.menu()|u }} +
+ +
+ {{ context.priority.menu(html_kwargs={"class": "custom-select"})|u }} +
+ +
+ {{ context.status.menu(html_kwargs={"class": "custom-select"})|u }} +
-
-
- -
- {{ context.status.menu()|u }} -
-
-
- -
-
- -
- -
-
-
- -
- + +
+ +
+ +
+ +
+ +
-
-
- -
-
- -
- {{ context.assignedto.menu()|u }} -
-
-
- -
- -
-
-
+ +
+ +
+ {{ context.assignedto.menu(html_kwargs={"class": "custom-select"})|u }} +
+ +
+ +
+
- -
-
- -
- -
-
-
+ +
+ +
+ +
+
- -
-
- -
- -
-
-
-
-
- {{ context.submit() }} - {% if context.id %} - {{ i18n.gettext('Make a copy')|u }} - {% endif %} -
- - + +
+ +
+ +
+
+ +
+ {{ context.submit(html_kwargs={"class": "btn btn-primary"}) }} + {% if context.id %} + {{ i18n.gettext('Make a copy')|u }} + {% endif %} +
+ +
diff --git a/share/roundup/templates/jinja2/html/issue.search.html b/share/roundup/templates/jinja2/html/issue.search.html index 86045d50a..fbe77e205 100644 --- a/share/roundup/templates/jinja2/html/issue.search.html +++ b/share/roundup/templates/jinja2/html/issue.search.html @@ -9,184 +9,180 @@ {% set group_on = (group_on and group_on[1]) or 'status' %} {% macro input(name, type='text') -%} - + {%- endmacro %} {% macro display_column(name) -%} - + {%- endmacro %} {% macro sort_column(name) -%} - + {%- endmacro %} {% macro group_column(name) -%} - + {%- endmacro %} {% macro option_value(option, id, name) -%} - + {%- endmacro %} {% block head_title %} - Issue searching +Issue searching {% endblock %} {% block page_header %} - Issue searching +Issue searching {% endblock %} {% block content %}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {{ i18n.gettext('Filter on')|u }}{{ i18n.gettext('Display')|u }}{{ i18n.gettext('Sort on')|u }}{{ i18n.gettext('Group on')|u }}
{{ i18n.gettext('All text*:')|u }}{{ input('@search_text') }}   
{{ i18n.gettext('Title:')|u }}{{ input('title') }}{{ display_column('title') }}{{ sort_column('title') }} 
{{ i18n.gettext('Keyword:')|u }}{{ display_column('id') }}{{ sort_column('id') }} 
{{ i18n.gettext('ID:')|u }}{{ input('id') }}{{ display_column('id') }}{{ sort_column('id') }} 
{{ i18n.gettext('Creation Date:')|u }}{{ input('creation') }}{{ display_column('creation') }}{{ sort_column('creation') }}{{ group_column('creation') }}
{{ i18n.gettext('Activity:')|u }}{{ input('activity') }}{{ display_column('activity') }}{{ sort_column('activity') }} 
{{ i18n.gettext('Priority:')|u }}{{ display_column('priority') }}{{ sort_column('priority') }}{{ group_column('priority') }}
Status:{{ display_column('status') }}{{ sort_column('status') }}{{ group_column('status') }}
{{ i18n.gettext('Assigned to:')|u }}{{ input('submitter') }}{{ display_column('assignedto') }}{{ sort_column('assignedto') }}{{ group_column('assignedto') }}
{{ i18n.gettext('No Sort or group:')|u }}  
{{ i18n.gettext('Pagesize:')|u }}
{{ i18n.gettext('Start With:')|u }}
{{ i18n.gettext('Sort Descending:')|u }}
{{ i18n.gettext('Group Descending:')|u }}
-   - -
  - {{ i18n.gettext('*: The "all text" field will look in message bodies and issue titles')|u }} -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {{ i18n.gettext('Filter on')|u }}{{ i18n.gettext('Display')|u }}{{ i18n.gettext('Sort on')|u }}{{ i18n.gettext('Group on')|u }}
{{ i18n.gettext('All text*:')|u }}{{ input('@search_text') }}   
{{ i18n.gettext('Title:')|u }}{{ input('title') }}{{ display_column('title') }}{{ sort_column('title') }} 
{{ i18n.gettext('Keyword:')|u }}{{ display_column('id') }}{{ sort_column('id') }} 
{{ i18n.gettext('ID:')|u }}{{ input('id') }}{{ display_column('id') }}{{ sort_column('id') }} 
{{ i18n.gettext('Creation Date:')|u }}{{ input('creation') }}{{ display_column('creation') }}{{ sort_column('creation') }}{{ group_column('creation') }}
{{ i18n.gettext('Activity:')|u }}{{ input('activity') }}{{ display_column('activity') }}{{ sort_column('activity') }} 
{{ i18n.gettext('Priority:')|u }}{{ display_column('priority') }}{{ sort_column('priority') }}{{ group_column('priority') }}
Status:{{ display_column('status') }}{{ sort_column('status') }}{{ group_column('status') }}
{{ i18n.gettext('Assigned to:')|u }}{{ input('submitter') }}{{ display_column('assignedto') }}{{ sort_column('assignedto') }}{{ group_column('assignedto') }}
{{ i18n.gettext('No Sort or group:')|u }}  
{{ i18n.gettext('Pagesize:')|u }}
{{ i18n.gettext('Start With:')|u }}
{{ i18n.gettext('Sort Descending:')|u }}
{{ i18n.gettext('Group Descending:')|u }}
+   + +
  + {{ i18n.gettext('*: The "all text" field will look in message bodies and issue titles')|u }} +
{% endblock %} diff --git a/share/roundup/templates/jinja2/html/layout/banner.html b/share/roundup/templates/jinja2/html/layout/banner.html index ba5adc50d..d70ee5c74 100644 --- a/share/roundup/templates/jinja2/html/layout/banner.html +++ b/share/roundup/templates/jinja2/html/layout/banner.html @@ -1,16 +1,15 @@ -
-
-
- {{ i18n.gettext('Roundup Demo Tracker')|u }} -
- - - - - - - -
-
-
+
+ + {{ i18n.gettext('Roundup Demo Tracker')|u }} + +
+ + + + + + + +
+
diff --git a/share/roundup/templates/jinja2/html/layout/navigation.html b/share/roundup/templates/jinja2/html/layout/navigation.html index aaf62ee36..a4ff78d2b 100644 --- a/share/roundup/templates/jinja2/html/layout/navigation.html +++ b/share/roundup/templates/jinja2/html/layout/navigation.html @@ -2,24 +2,24 @@ {% set columns_showall = 'id,activity,title,creator,assignedto,status' %} {% if request.user.hasPermission('View', 'query') %} -

+

{{ i18n.gettext('Your Queries')|u }} ({{ i18n.gettext('edit')|u }}) -

+

{% endif %} {% if request.user.hasPermission('View', 'issue') %} - +
{% else %} -

{{ i18n.gettext("You don't have permission to view issues.") }}

+

{{ i18n.gettext("You don't have permission to view issues.") }}

{% endif %} -