##// END OF EJS Templates
gists: updated template names and synced edit with create template.
marcink -
r3870:796d3ee3 default
parent child Browse files
Show More
@@ -72,7 +72,7 b' class GistView(BaseAppView):'
72 @LoginRequired()
72 @LoginRequired()
73 @view_config(
73 @view_config(
74 route_name='gists_show', request_method='GET',
74 route_name='gists_show', request_method='GET',
75 renderer='rhodecode:templates/admin/gists/index.mako')
75 renderer='rhodecode:templates/admin/gists/gist_index.mako')
76 def gist_show_all(self):
76 def gist_show_all(self):
77 c = self.load_default_context()
77 c = self.load_default_context()
78
78
@@ -136,7 +136,7 b' class GistView(BaseAppView):'
136 @NotAnonymous()
136 @NotAnonymous()
137 @view_config(
137 @view_config(
138 route_name='gists_new', request_method='GET',
138 route_name='gists_new', request_method='GET',
139 renderer='rhodecode:templates/admin/gists/new.mako')
139 renderer='rhodecode:templates/admin/gists/gist_new.mako')
140 def gist_new(self):
140 def gist_new(self):
141 c = self.load_default_context()
141 c = self.load_default_context()
142 return self._get_template_context(c)
142 return self._get_template_context(c)
@@ -146,7 +146,7 b' class GistView(BaseAppView):'
146 @CSRFRequired()
146 @CSRFRequired()
147 @view_config(
147 @view_config(
148 route_name='gists_create', request_method='POST',
148 route_name='gists_create', request_method='POST',
149 renderer='rhodecode:templates/admin/gists/new.mako')
149 renderer='rhodecode:templates/admin/gists/gist_new.mako')
150 def gist_create(self):
150 def gist_create(self):
151 _ = self.request.translate
151 _ = self.request.translate
152 c = self.load_default_context()
152 c = self.load_default_context()
@@ -196,7 +196,7 b' class GistView(BaseAppView):'
196 errors['filename'] = errors['nodes.0.filename']
196 errors['filename'] = errors['nodes.0.filename']
197 del errors['nodes.0.filename']
197 del errors['nodes.0.filename']
198
198
199 data = render('rhodecode:templates/admin/gists/new.mako',
199 data = render('rhodecode:templates/admin/gists/gist_new.mako',
200 self._get_template_context(c), self.request)
200 self._get_template_context(c), self.request)
201 html = formencode.htmlfill.render(
201 html = formencode.htmlfill.render(
202 data,
202 data,
@@ -260,10 +260,10 b' class GistView(BaseAppView):'
260 @LoginRequired()
260 @LoginRequired()
261 @view_config(
261 @view_config(
262 route_name='gist_show', request_method='GET',
262 route_name='gist_show', request_method='GET',
263 renderer='rhodecode:templates/admin/gists/show.mako')
263 renderer='rhodecode:templates/admin/gists/gist_show.mako')
264 @view_config(
264 @view_config(
265 route_name='gist_show_rev', request_method='GET',
265 route_name='gist_show_rev', request_method='GET',
266 renderer='rhodecode:templates/admin/gists/show.mako')
266 renderer='rhodecode:templates/admin/gists/gist_show.mako')
267 @view_config(
267 @view_config(
268 route_name='gist_show_formatted', request_method='GET',
268 route_name='gist_show_formatted', request_method='GET',
269 renderer=None)
269 renderer=None)
@@ -304,7 +304,7 b' class GistView(BaseAppView):'
304 @NotAnonymous()
304 @NotAnonymous()
305 @view_config(
305 @view_config(
306 route_name='gist_edit', request_method='GET',
306 route_name='gist_edit', request_method='GET',
307 renderer='rhodecode:templates/admin/gists/edit.mako')
307 renderer='rhodecode:templates/admin/gists/gist_edit.mako')
308 def gist_edit(self):
308 def gist_edit(self):
309 _ = self.request.translate
309 _ = self.request.translate
310 gist_id = self.request.matchdict['gist_id']
310 gist_id = self.request.matchdict['gist_id']
@@ -338,7 +338,7 b' class GistView(BaseAppView):'
338 @CSRFRequired()
338 @CSRFRequired()
339 @view_config(
339 @view_config(
340 route_name='gist_update', request_method='POST',
340 route_name='gist_update', request_method='POST',
341 renderer='rhodecode:templates/admin/gists/edit.mako')
341 renderer='rhodecode:templates/admin/gists/gist_edit.mako')
342 def gist_update(self):
342 def gist_update(self):
343 _ = self.request.translate
343 _ = self.request.translate
344 gist_id = self.request.matchdict['gist_id']
344 gist_id = self.request.matchdict['gist_id']
@@ -8,9 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 ${_('Edit Gist')} &middot; ${c.gist.gist_access_id}
13 </%def>
14
12
15 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
16 ${self.menu_items(active='gists')}
14 ${self.menu_items(active='gists')}
@@ -20,17 +18,14 b''
20 <div class="box">
18 <div class="box">
21 <!-- box / title -->
19 <!-- box / title -->
22 <div class="title">
20 <div class="title">
23 ${self.breadcrumbs()}
21
24 </div>
22 </div>
25
23
26 <div class="table">
24 <div class="table">
27
28 <div id="files_data">
25 <div id="files_data">
29 ${h.secure_form(h.route_path('gist_update', gist_id=c.gist.gist_access_id), id='eform', request=request)}
26 ${h.secure_form(h.route_path('gist_update', gist_id=c.gist.gist_access_id), id='eform', request=request)}
30 <div>
27 <div>
31 <input type="hidden" value="${c.file_last_commit.raw_id}" name="parent_hash">
28 <input type="hidden" value="${c.file_last_commit.raw_id}" name="parent_hash">
32 <textarea id="description" name="description"
33 placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea>
34 <div>
29 <div>
35 <span class="gist-gravatar">
30 <span class="gist-gravatar">
36 ${self.gravatar(h.email_or_none(c.rhodecode_user.full_contact), 30)}
31 ${self.gravatar(h.email_or_none(c.rhodecode_user.full_contact), 30)}
@@ -40,6 +35,9 b''
40
35
41 <label for='gist_acl_level'>${_('Gist access level')}</label>
36 <label for='gist_acl_level'>${_('Gist access level')}</label>
42 ${h.dropdownmenu('gist_acl_level', c.gist.acl_level, c.acl_options)}
37 ${h.dropdownmenu('gist_acl_level', c.gist.acl_level, c.acl_options)}
38
39 <textarea style="margin-top: 5px; border-color: #dbd9da" id="description" name="description"
40 placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea>
43 </div>
41 </div>
44 </div>
42 </div>
45
43
1 NO CONTENT: file renamed from rhodecode/templates/admin/gists/index.mako to rhodecode/templates/admin/gists/gist_index.mako
NO CONTENT: file renamed from rhodecode/templates/admin/gists/index.mako to rhodecode/templates/admin/gists/gist_index.mako
@@ -37,7 +37,7 b''
37 <label for='acl_level'>${_('Gist access level')}</label>
37 <label for='acl_level'>${_('Gist access level')}</label>
38 ${h.dropdownmenu('gist_acl_level', '', c.acl_options)}
38 ${h.dropdownmenu('gist_acl_level', '', c.acl_options)}
39
39
40 <textarea style="margin-top: 5px" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
40 <textarea style="margin-top: 5px; border-color: #dbd9da" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
41 </div>
41 </div>
42
42
43 <div id="codeblock" class="codeblock">
43 <div id="codeblock" class="codeblock">
1 NO CONTENT: file renamed from rhodecode/templates/admin/gists/show.mako to rhodecode/templates/admin/gists/gist_show.mako
NO CONTENT: file renamed from rhodecode/templates/admin/gists/show.mako to rhodecode/templates/admin/gists/gist_show.mako
General Comments 0
You need to be logged in to leave comments. Login now