hg diff after mistery pull
1 [env_beyle] [briareus:/Media/beyle/beyle-repo] betabug% hg diff
2 diff -r 916e74bdf164 beyle/urls.py
3 --- a/beyle/urls.py Tue Dec 13 14:10:04 2011 +0200
4 +++ b/beyle/urls.py Sat Dec 17 17:29:00 2011 +0200
5 @@ -10,147 +10,258 @@
6 url(r'^settings/view/(?P<view>\w+)/$',
7 'set_view', name='set_view'),
8
9 - url(r'^autores/imprimir/$', 'autores',
10 - {'printable': True}, name='artists_printable'),
11 + # Urls matching default versions of artists listings
12 + url(r'^artists/$',
13 + 'artists', name='artists_print'),
14 + url(r'^artists/(P<viewtype>\w+)/$',
15 + 'artists', name='artists_viewtype_print'),
16 + url(r'^artists/orderby/(?P<orderby>\w+)/$',
17 + 'artists', name='artists_ordered_print'),
18 + url(r'^artists/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/$',
19 + 'artists', name='artists_ordered_viewtype_print'),
20
21 - (r'^autores/lista/imprimir/$', 'autores', {'viewtype': 'list', 'printable': True}),
22 - (r'^autores/fichas/imprimir/$', 'autores', {'viewtype': 'icon', 'printable': True}),
23 - (r'^autores/(?P<orderby>\w+)/imprimir/$', 'autores', {'printable': True}),
24 - (r'^autores/(?P<orderby>\w+)/lista/imprimir/$', 'autores', {'viewtype': 'list', 'printable': True}),
25 - (r'^autores/(?P<orderby>\w+)/fichas/imprimir/$', 'autores', {'viewtype': 'icon', 'printable': True}),
26 + # Urls matching printable versions of artists information
27 + url(r'^artists/print/$',
28 + 'artists', {'printable': True},
29 + name='artists_print'),
30 + url(r'^artists/(P<viewtype>\w+)/print/$',
31 + 'artists', {'printable': True},
32 + name='artists_viewtype_print'),
33 + url(r'^artists/orderby/(?P<orderby>\w+)/print/$',
34 + 'artists', {'printable': True},
35 + name='artists_ordered_print'),
36 + url(r'^artists/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/print/$',
37 + 'artists', {'printable': True},
38 + name='artists_ordered_viewtype_print'),
39
40 - (r'^autores/guardar/$', 'autores', {'pdf': True}),
41 - (r'^autores/lista/guardar/$', 'autores', {'viewtype': 'list', 'pdf': True}),
42 - (r'^autores/fichas/guardar/$', 'autores', {'viewtype': 'icon', 'pdf': True}),
43 - (r'^autores/(?P<orderby>\w+)/guardar/$', 'autores', {'pdf': True}),
44 - (r'^autores/(?P<orderby>\w+)/lista/guardar/$', 'autores', {'viewtype': 'list', 'pdf': True}),
45 - (r'^autores/(?P<orderby>\w+)/fichas/guardar/$', 'autores', {'viewtype': 'icon', 'pdf': True}),
46 + # Urls matching pdf versions of artists information
47 + url(r'^artists/pdf/$',
48 + 'artists', {'pdf': True},
49 + name='artists_pdf'),
50 + url(r'^artists/(P<viewtype>\w+)/pdf/$',
51 + 'artists', {'pdf': True},
52 + name='artists_viewtype_pdf'),
53 + url(r'^artists/orderby/(?P<orderby>\w+)/pdf/$',
54 + 'artists', {'pdf': True},
55 + name='artists_ordered_pdf'),
56 + url(r'^artists/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/pdf/$',
57 + 'artists', {'pdf': True},
58 + name='artists_ordered_viewtype_pdf'),
59
60 - (r'^autores/mail/$', 'enviar_por_mail', {'listado': 'autores'}),
61 - (r'^autores/lista/mail/$', 'enviar_por_mail', {'listado': 'autores', 'viewtype': 'list'}),
62 - (r'^autores/fichas/mail/$', 'enviar_por_mail', {'listado': 'autores', 'viewtype': 'icon'}),
63 - (r'^autores/(?P<orderby>\w+)/mail/$', 'enviar_por_mail', {'listado': 'autores'}),
64 - (r'^autores/(?P<orderby>\w+)/lista/mail/$', 'enviar_por_mail', {'listado': 'autores', 'viewtype': 'list'}),
65 - (r'^autores/(?P<orderby>\w+)/fichas$/mail/', 'enviar_por_mail', {'listado': 'autores', 'viewtype': 'icon'}),
66 + # Urls matching send-by-mail requests for artists' data
67 + url(r'^artists/mail/$',
68 + 'send_by_mail', {'data': 'artists'},
69 + name='artists_mail'),
70 + url(r'^artists/(P<viewtype>\w+)/mail/$',
71 + 'send_by_mail', {'data': 'artists'},
72 + name='artists_viewtype_mail'),
73 + url(r'^artists/orderby/(?P<orderby>\w+)/mail/$',
74 + 'send_by_mail', {'data': 'artists'},
75 + name='artists_ordered_mail'),
76 + url(r'^artists/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/mail/$',
77 + 'send_by_mail', {'data': 'artists'},
78 + name='artists_ordered_viewtype_mail'),
79
80 + # Urls matching detailed information about a given artist
81 + url(r'^artist/(?P<artist_id>\d+)/$',
82 + 'artist', name='artist'),
83 + url(r'^artist/(?P<artist_id>\d+)/print/$',
84 + 'artist', {'printable': True}, name='artist_print'),
85 + url(r'^artist/(?P<artist_id>\d+)/pdf/$',
86 + 'artist', {'pdf': True}, name='artist_pdf'),
87 + url(r'^artist/(?P<artist_id>\d+)/mail/$',
88 + 'enviar_por_mail', name='artist_mail'),
89 + url(r'^artist/(?P<artist_id>\d+)/(?P<save_type>\w+)$',
90 + 'artist', name='artist_save_data'),
91 +
92
93 - (r'^autores/$', 'autores'),
94 - (r'^autores/lista/$', 'autores', {'viewtype': 'list'}),
95 - (r'^autores/fichas/$', 'autores', {'viewtype': 'icon'}),
96 - (r'^autores/(?P<orderby>\w+)/$', 'autores'),
97 - (r'^autores/(?P<orderby>\w+)/lista/$', 'autores', {'viewtype': 'list'}),
98 - (r'^autores/(?P<orderby>\w+)/fichas/$', 'autores', {'viewtype': 'icon'}),
99 + # Urls matching default versions of artworks listings
100 + url(r'^artworks/$',
101 + 'artworks', name='artworks'),
102 + url(r'^artworks/(P<viewtype>\w+)/$',
103 + 'artworks', name='artworks_viewtype'),
104 + url(r'^artworks/orderby/(?P<orderby>\w+)/$',
105 + 'artworks', name='artworks_ordered'),
106 + url(r'^artworks/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/$',
107 + 'artworks', name='artworks_ordered_viewtype'),
108
109 - (r'^autor/(?P<autor_id>\d+)/imprimir/$', 'autor', {'printable': True}),
110 - (r'^autor/(?P<autor_id>\d+)/guardar/$', 'autor', {'pdf': True}),
111 - (r'^autor/(?P<autor_id>\d+)/mail/$', 'enviar_por_mail'),
112 - (r'^autor/(?P<autor_id>\d+)/$', 'autor'),
113 - (r'^autor/(?P<autor_id>\d+)/(?P<save_type>\w+)$', 'autor'),
114 + # Urls matching printable versions of artworks information
115 + url(r'^artworks/print/$',
116 + 'artworks', {'printable': True},
117 + name='artworks_print'),
118 + url(r'^artworks/(P<viewtype>\w+)/print/$',
119 + 'artworks', {'printable': True},
120 + name='artworks_viewtype_print'),
121 + url(r'^artworks/orderby/(?P<orderby>\w+)/print/$',
122 + 'artworks', {'printable': True},
123 + name='artworks_ordered_print'),
124 + url(r'^artworks/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/print/$',
125 + 'artworks', {'printable': True},
126 + name='artworks_ordered_viewtype_print'),
127
128 - (r'^obras/imprimir/$', 'obras', {'printable': True}),
129 - (r'^obras/lista/imprimir/$', 'obras', {'viewtype': 'list', 'printable': True}),
130 - (r'^obras/fichas/imprimir/$', 'obras', {'viewtype': 'icon', 'printable': True}),
131 - (r'^obras/(?P<orderby>\w+)/imprimir/$', 'obras', {'printable': True}),
132 - (r'^obras/(?P<orderby>\w+)/lista/imprimir/$', 'obras', {'viewtype': 'list', 'printable': True}),
133 - (r'^obras/(?P<orderby>\w+)/fichas/imprimir/$', 'obras', {'viewtype': 'icon', 'printable': True}),
134 + # Urls matching pdf versions of artworks information
135 + url(r'^artworks/pdf/$',
136 + 'artworks', {'pdf': True},
137 + name='artworks_pdf'),
138 + url(r'^artworks/(P<viewtype>\w+)/pdf/$',
139 + 'artworks', {'pdf': True},
140 + name='artworks_viewtype_pdf'),
141 + url(r'^artworks/orderby/(?P<orderby>\w+)/pdf/$',
142 + 'artworks', {'pdf': True},
143 + name='artworks_ordered_pdf'),
144 + url(r'^artworks/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/pdf/$',
145 + 'artworks', {'pdf': True},
146 + name='artworks_ordered_viewtype_pdf'),
147
148 - (r'^obras/guardar/$', 'obras', {'pdf': True}),
149 - (r'^obras/lista/guardar/$', 'obras', {'viewtype': 'list', 'pdf': True}),
150 - (r'^obras/fichas/guardar/$', 'obras', {'viewtype': 'icon', 'pdf': True}),
151 - (r'^obras/(?P<orderby>\w+)/guardar/$', 'obras', {'pdf': True}),
152 - (r'^obras/(?P<orderby>\w+)/lista/guardar/$', 'obras', {'viewtype': 'list', 'pdf': True}),
153 - (r'^obras/(?P<orderby>\w+)/fichas/guardar/$', 'obras', {'viewtype': 'icon', 'pdf': True}),
154 + # Urls matching send-by-mail requests for artworks' data
155 + url(r'^artworks/mail/$',
156 + 'send_by_mail', {'data': 'artworks'},
157 + name='artworks_mail'),
158 + url(r'^artworks/(P<viewtype>\w+)/mail/$',
159 + 'send_by_mail', {'data': 'artworks'},
160 + name='artworks_viewtype_mail'),
161 + url(r'^artworks/orderby/(?P<orderby>\w+)/mail/$',
162 + 'send_by_mail', {'data': 'artworks'},
163 + name='artworks_ordered_mail'),
164 + url(r'^artworks/orderby/(?P<orderby>\w+)/(P<viewtype>\w+)/mail/$',
165 + 'send_by_mail', {'data': 'artworks'},
166 + name='artworks_ordered_viewtype_mail'),
167
168 - (r'^obras/mail/$', 'enviar_por_mail', {'listado': 'obras'}),
169 - (r'^obras/lista/mail/$', 'enviar_por_mail', {'listado': 'obras', 'viewtype': 'list'}),
170 - (r'^obras/fichas/mail/$', 'enviar_por_mail', {'listado': 'obras', 'viewtype': 'icon'}),
171 - (r'^obras/(?P<orderby>\w+)/mail/$', 'enviar_por_mail', {'listado': 'obras'}),
172 - (r'^obras/(?P<orderby>\w+)/lista/mail/$', 'enviar_por_mail', {'listado': 'obras', 'viewtype': 'list'}),
173 - (r'^obras/(?P<orderby>\w+)/fichas/mail/$', 'enviar_por_mail', {'listado': 'obras', 'viewtype': 'icon'}),
174
175 - (r'^obras/$', 'obras'),
176 - (r'^obras/lista/$', 'obras', {'viewtype': 'list'}),
177 - (r'^obras/fichas/$', 'obras', {'viewtype': 'icon'}),
178 - (r'^obras/(?P<orderby>\w+)/$', 'obras'),
179 - (r'^obras/(?P<orderby>\w+)/lista/$', 'obras', {'viewtype': 'list'}),
180 - (r'^obras/(?P<orderby>\w+)/fichas/$', 'obras', {'viewtype': 'icon'}),
181 + url(r'^artwork/(?P<artwork_id>\d+)/print/$', 'artwork', {'printable': True}),
182 + url(r'^artwork/(?P<artwork_id>\d+)/pdf/$', 'artwork', {'pdf': True}),
183 + url(r'^artwork/(?P<artwork_id>\d+)/mail/$', 'enviar_por_mail'),
184
185 - (r'^obra/(?P<obra_id>\d+)/imprimir/$', 'obra', {'printable': True}),
186 - (r'^obra/(?P<obra_id>\d+)/guardar/$', 'obra', {'pdf': True}),
187 - (r'^obra/(?P<obra_id>\d+)/mail/$', 'enviar_por_mail'),
188 - (r'^obra/(?P<obra_id>\d+)/historico/(?P<tipo_historico>\w+)/imprimir/$', 'historico_obra', {'printable': True}),
189 + # Urls matching detailed information about a given artwork
190 + url(r'^artwork/(?P<artwork_id>\d+)/$',
191 + 'artwork', name='artwork'),
192 + url(r'^artwork/(?P<artwork_id>\d+)/print/$',
193 + 'artwork', {'printable': True}, name='artwork_print'),
194 + url(r'^artwork/(?P<artwork_id>\d+)/pdf/$',
195 + 'artwork', {'pdf': True}, name='artwork_pdf'),
196 + url(r'^artwork/(?P<artwork_id>\d+)/mail/$',
197 + 'enviar_por_mail', name='artwork_mail'),
198
199 - (r'^obra/(?P<obra_id>\d+)/historico/(?P<tipo_historico>\w+)/guardar/$', 'historico_obra', {'pdf': True}), #
200 - (r'^obra/(?P<obra_id>\d+)/historico/(?P<tipo_historico>\w+)/mail/$', 'enviar_por_mail'), #
201 + # Urls matching detailed information about a given artwork
202 + # history
203 + url(r'^artwork/(?P<artwork_id>\d+)/history/(?P<history_type>\w+)/$',
204 + 'historico_artwork', name='artwork_history'),
205 + url(r'^artwork/(?P<artwork_id>\d+)/history/(?P<history_type>\w+)/$',
206 + 'historico_artwork', {'printable': True},
207 + name='artwork_history_print'),
208 + url(r'^artwork/(?P<artwork_id>\d+)/history/(?P<history_type>\w+)/$',
209 + 'historico_artwork', {'pdf': True},
210 + name='artwork_history_pdf'),
211 + url(r'^artwork/(?P<artwork_id>\d+)/history/(?P<history_type>\w+)/$',
212 + 'send_by_mail', name='artwork_history_mail'),
213
214 - (r'^obra/(?P<obra_id>\d+)/restauracion/imprimir/$', 'restauracion_obra', {'printable': True}),
215 + # Urls matching detailed information about a given artwork
216 + # restorations
217 + url(r'^artwork/(?P<artwork_id>\d+)/restorations/$',
218 + 'artwork_restorations', name='artwork_restorations'),
219 + url(r'^artwork/(?P<artwork_id>\d+)/restorations/print/$',
220 + 'artwork_restorations', {'printable': True},
221 + name='artwork_restorations_print'),
222
223 - (r'^obra/(?P<obra_id>\d+)/$', 'obra'),
224 - (r'^obra/(?P<obra_id>\d+)/historico/(?P<tipo_historico>\w+)$', 'historico_obra'),
225 - (r'^obra/(?P<obra_id>\d+)/restauracion$', 'restauracion_obra'),
226 + # Urls matching detailed information about a given artwork
227 + # adquisition
228 + url(r'^artwork/(?P<artwork_id>\d+)/adquisition/$',
229 + 'historico_artwork', name='artwork_adquisition'),
230 + url(r'^artwork/(?P<artwork_id>\d+)/adquisition/$',
231 + 'historico_artwork', {'printable': True},
232 + name='artwork_adquisition_print'),
233 + url(r'^artwork/(?P<artwork_id>\d+)/adquisition/$',
234 + 'historico_artwork', {'pdf': True},
235 + name='artwork_adquisition_pdf'),
236 + url(r'^artwork/(?P<artwork_id>\d+)/adquisition/$',
237 + 'send_by_mail', {'adquisition': True},
238 + name='artwork_adquisition_mail'),
239 + url(r'^artwork/(?P<artwork_id>\d+)/adquisition/(?P<save_type>\w+)/$',
240 + 'artwork_adquisition', name='artwork_save_data'),
241
242 - (r'^obra/(?P<obra_id>\d+)/ingreso$', 'ingreso_obra'),
243 - (r'^obra/(?P<obra_id>\d+)/ingreso/(?P<save_type>\w+)$', 'ingreso_obra'),
244 + # Match for saving different types of data coming from
245 + # the artwork detailed view
246 + url(r'^artwork/(?P<artwork_id>\d+)/(?P<save_type>\w+)/$',
247 + 'artwork', name='artwork_save_data'),
248 +
249
250 - (r'^obra/(?P<obra_id>\d+)/ingreso/imprimir/$', 'ingreso_obra', {'printable': True}),
251 - (r'^obra/(?P<obra_id>\d+)/ingreso/guardar/$', 'ingreso_obra', {'pdf': True}),
252 - (r'^obra/(?P<obra_id>\d+)/ingreso/mail/$', 'enviar_por_mail', {'ingreso': True}),
253 + # Urls matching showrooms information
254 + url(r'^showrooms/$',
255 + 'showrooms', name='showrooms'),
256 + url(r'^showrooms/(P<viewtype>\w+)/$',
257 + 'showrooms', name='showrooms_viewtype'),
258
259 - (r'^obra/(?P<obra_id>\d+)/(?P<save_type>\w+)$', 'obra'),
260 + url(r'^showrooms/print/$',
261 + 'showrooms', {'printable': True},
262 + name='showrooms_print'),
263 + url(r'^showrooms/(P<viewtype>\w+)/print/$',
264 + 'showrooms', {'printable': True},
265 + name='showrooms_viewtype_print'),
266
267 - (r'^salas/imprimir/$', 'salas', {'printable': True}),
268 - (r'^salas/lista/imprimir/$', 'salas', {'viewtype': 'list', 'printable': True}),
269 - (r'^salas/fichas/imprimir/$', 'salas', {'viewtype': 'icon', 'printable': True}),
270 - (r'^sala/(?P<sala_id>\d+)/imprimir/$', 'sala', {'printable': True}),
271 + url(r'^showrooms/pdf/$',
272 + 'showrooms', {'pdf': True},
273 + name='showrooms_pdf'),
274 + url(r'^showrooms/(P<viewtype>\w+)/pdf/$',
275 + 'showrooms', {'pdf': True},
276 + name='showrooms_viewtype_pdf'),
277
278 - (r'^salas/guardar/$', 'salas', {'pdf': True}),
279 - (r'^salas/lista/guardar/$', 'salas', {'viewtype': 'list', 'pdf': True}),
280 - (r'^salas/fichas/guardar/$', 'salas', {'viewtype': 'icon', 'pdf': True}),
281 - (r'^sala/(?P<sala_id>\d+)/guardar/$', 'sala', {'pdf': True}),
282 + url(r'^showrooms/mail/$',
283 + 'send_by_mail', {'data': 'showrooms'},
284 + name='showrooms_mail'),
285 + url(r'^showrooms/(P<viewtype>\w+)/mail/$',
286 + 'showrooms', {'data': 'showrooms'},
287 + name='showrooms_viewtype_mail'),
288
289 - (r'^salas/mail/$', 'enviar_por_mail', {'listado': 'salas'}),
290 - (r'^salas/lista/mail/$', 'enviar_por_mail', {'listado': 'salas', 'viewtype': 'list'}),
291 - (r'^salas/fichas/mail/$', 'enviar_por_mail', {'listado': 'salas', 'viewtype': 'icon'}),
292 - (r'^sala/(?P<sala_id>\d+)/mail/$', 'enviar_por_mail'), #
293 + url(r'^showrooms/gallery/$', 'showrooms',
294 + {'viewtype': 'gallery'}, name='showrooms_gallery'),
295
296 - (r'^salas/$', 'salas'),
297 - (r'^salas/lista/$', 'salas', {'viewtype': 'list'}),
298 - (r'^salas/fichas/$', 'salas', {'viewtype': 'icon'}),
299 - (r'^sala/(?P<sala_id>\d+)/$', 'sala'),
300 + url(r'^showroom/(?P<showroom_id>\d+)/$',
301 + 'showroom', name='showroom'),
302 + url(r'^showroom/(?P<showroom_id>\d+)/mail/$',
303 + 'send_by_mail', name='showroom_mail'),
304 + url(r'^showroom/(?P<showroom_id>\d+)/gallery/$',
305 + 'showroom', {'gallery': True},
306 + name='showroom_gallery'),
307
308 - (r'^salas/galeria/$', 'salas', {'viewtype': 'gallery'}), #
309 - (r'^sala/(?P<sala_id>\d+)/galeria/$', 'sala', {'gallery': True}), #
310 + # Urls matching the gallery view
311 + url(r'^gallery/slides/$', 'gallery',
312 + {'viewtype': 'slides'}, name='gallery_slides'),
313 + url(r'^gallery/slides/(?P<orderby>\w+)/$', 'gallery',
314 + {'viewtype': 'slides'}, name='gallery_slides_ordered'),
315 + url(r'^gallery/$', 'gallery', name='gallery'),
316 + url(r'^gallery/orderby/(?P<orderby>\w+)/$', 'gallery',
317 + name='gallery_ordered'),
318 + url(r'^gallery/(?P<viewtype>\w+)$', 'gallery',
319 + name='gallery_viewtype'),
320 + url(r'^gallery/(?P<viewtype>\w+)/orderby/(?P<orderby>\w+)/$',
321 + 'gallery', name='gallery_viewtype_orderby'),
322
323 - (r'^galeria/slide/$', 'galeria', {'viewtype': 'slide'}),
324 - (r'^galeria/slide/(?P<orderby>\w+)/$', 'galeria', {'viewtype': 'slide'}),
325 - (r'^galeria/$', 'galeria'),
326 - (r'^galeria/(?P<orderby>\w+)/$', 'galeria'),
327 - #(r'^galeria/lista/$', 'galeria', {'viewtype': 'list'}),
328 - #(r'^galeria/fichas/$', 'galeria', {'viewtype': 'icon'}),
329 - #(r'^galeria/flow/$', 'galeria', {'viewtype': 'flow'}),
330 + # FIXME: requests matching this url entry will come from an
331 + # artwork detail page, perhaps some other url would fit
332 + # better in the url naming schema for the app
333 + url(r'^gallery/delete/(?P<picture_id>\d+)/yes/$',
334 + 'delete_artwork_picture', {'delete': True}),
335
336 - (r'^galeria/borrar/(?P<imagen_id>\d+)/si$', 'galeria_borrar', {'borrar': True}),
337 + # logout url
338 + # FIXME: there are better ways to handle this in recent
339 + # versions of django, we will change this soon.
340 + url(r'^logout/$', 'logout_view', name='logout'),
341
342 - (r'^logout/$', 'logout_view'),
343 - (r'^admin/', include(admin.site.urls)),
344 -
345 - (r'^buscar/$', 'buscador_general'),
346 - (r'^buscador/(?P<opcion>\w+)/$', 'buscador_avanzado'),
347 - (r'^buscador/$', 'buscador_avanzado'),
348 -
349 - (r'^herramientas/seguros/$', 'listado_seguros'),
350 - (r'^herramientas/seguros/imprimir/$', 'listado_seguros', { 'printable' : True}),
351 - (r'^herramientas/seguros/guardar/$', 'listado_seguros', {'pdf': True}),
352 - (r'^herramientas/seguros/mail/$', 'enviar_por_mail', {'listado': 'seguros'}),
353 -
354 - (r'^herramientas/seguros/(?P<year>\d+)/$', 'listado_seguros'),
355 - (r'^herramientas/seguros/(?P<year>\d+)/imprimir/$', 'listado_seguros', { 'printable' : True}),
356 - (r'^herramientas/seguros/(?P<year>\d+)/guardar/$', 'listado_seguros', {'pdf': True}),
357 - (r'^herramientas/seguros/(?P<year>\d+)/mail/$', 'enviar_por_mail', {'listado': 'seguros'}),
358 -
359 - (r'^herramientas/DVD/$', 'exportar_DVD'),
360 - (r'^herramientas/DVD/texto/(?P<texto_id>\d+)/$', 'obtener_texto_DVD'),
361 - (r'^herramientas/CD$', 'exportar_DVD'),
362 - (r'^herramientas/sync$', 'sincronizar_portal'),
363 - (r'^herramientas/$', 'herramientas'),
364 + # fIXME: The admin link shouldn't be here, but in the project
365 + # urls.py file.
366 + # url(r'^admin/', include(admin.site.urls)),
367 + url(r'^search/$', 'simple_search',
368 + name='simple_search'),
369 + url(r'^search/advanced/$', 'advanced_search',
370 + name='advanced_search'),
371 + url(r'^search/advanced/(?P<option>\w+)/$',
372 + 'advanced_search', name='advanced_search_option'),
373 +
374 + # Urls matching the tools
375 + url(r'^tools/$', 'tools', name='tools'),
376 + url(r'^tools/DVD/$', 'DVDExport', name='dvd_export_tool'),
377 + url(r'^tools/CD$', 'DVDExport', name='cd_export_tool'),
378 + url(r'^tools/DVD/text/(?P<text_id>\d+)/$', 'getDVDText',
379 + name='get_dvd_text'),
380 + url(r'^tools/sync$', 'sync_website', name='sync_tool'),
381 )
382 diff -r 916e74bdf164 beyle/views.py
383 --- a/beyle/views.py Tue Dec 13 14:10:04 2011 +0200
384 +++ b/beyle/views.py Sat Dec 17 17:29:00 2011 +0200
385 @@ -977,7 +977,7 @@
386
387
388 @login_required
389 -def gallery(request, viewtype='icon', orderby='reg_number', printable=False):
390 +def gallery(request, viewtype='cards', orderby='reg_number', printable=False):
391 """
392 Show a gallery containing all the artworks of the current selected
393 collection
394 @@ -988,7 +988,7 @@
395 template = 'beyle/gallery.html'
396 if viewtype == 'list':
397 template = 'beyle/gallery_list.html'
398 - if viewtype == 'slide':
399 + if viewtype == 'slides':
400 template = 'beyle/gallery_slides.html'
401 if viewtype == 'flow':
402 template = 'beyle/gallery_flow.html'
403 @@ -2009,9 +2009,9 @@
404
405
406 @login_required
407 -def sent_by_mail(request, listado=False, orderby=False, viewtype=False,
408 - artwork_id=False, autor_id=False, sala_id=False,
409 - tipo_historico=False, ingreso=False, year=None):
410 +def send_by_mail(request, data=False, orderby=False, viewtype=False,
411 + artwork_id=False, artist_id=False, showroom_id=False,
412 + history_type=False, adquisition=False, year=None):
413
414 """
415 FIXME: Working on this
416 [env_beyle] [briareus:/Media/beyle/beyle-repo] betabug% hg commit
Pasted by bebu on
diciembre 17, 2011 at 16:10 |
Lang: text |
(416 lines of code)