Commit e71e2498333a93bc0789346d2fcd6f80542f9d36

Authored by Bartłomiej Nitoń
1 parent 002f96cc

Cleaning unused entry view code.

dictionary/static/css/jqgrid.css
@@ -39,11 +39,6 @@ ul li:hover ul { @@ -39,11 +39,6 @@ ul li:hover ul {
39 display: none; 39 display: none;
40 } 40 }
41 41
42 -.vsplitbar {  
43 - width: 7px;  
44 - background: #bbc;  
45 -}  
46 -  
47 .ui-jqgrid .selected-row { 42 .ui-jqgrid .selected-row {
48 background-color: blue; 43 background-color: blue;
49 background-image: none; 44 background-image: none;
dictionary/static/css/lemma_view.css deleted
1 -/* splittbar */  
2 -.hsplitbar {  
3 - height: 7px;  
4 - background: #bbc;  
5 -}  
6 -  
7 -#framesSplit div {  
8 - overflow: auto;  
9 -}  
10 -  
11 -#prevFramesSplit div {  
12 - overflow: auto;  
13 -}  
dictionary/views.py
@@ -11,12 +11,12 @@ from django.http import HttpResponse @@ -11,12 +11,12 @@ from django.http import HttpResponse
11 11
12 import settings 12 import settings
13 from accounts.models import UserSettings 13 from accounts.models import UserSettings
14 -from common.decorators import render 14 +from common.decorators import render, ajax
15 from dictionary.ajax_jqgrid import default_sort_rules 15 from dictionary.ajax_jqgrid import default_sort_rules
16 from dictionary.filtering import all_filter_rules_loaded, default_filter_rules 16 from dictionary.filtering import all_filter_rules_loaded, default_filter_rules
17 -from dictionary.forms import UserCreateForm, GetVocabularyForm, ArgStatsForm  
18 -from dictionary.models import PositionCategory, NKJP_Opinion, NKJP_Source, \  
19 - Vocabulary, Message, RealizationType 17 +from dictionary.forms import UserCreateForm, GetVocabularyForm
  18 +from dictionary.models import Lemma, PositionCategory, NKJP_Opinion, NKJP_Source, \
  19 + Vocabulary, Message, RealizationType, get_ready_statuses
20 from dictionary.ajax_lemma_view import getFrequentPositions, order_sort_rules 20 from dictionary.ajax_lemma_view import getFrequentPositions, order_sort_rules
21 21
22 22
@@ -246,248 +246,6 @@ def lemma_view(request): @@ -246,248 +246,6 @@ def lemma_view(request):
246 246
247 return {'js_vars': js_vars} 247 return {'js_vars': js_vars}
248 248
249 -  
250 -from dictionary.models import Lemma, get_ready_statuses  
251 -from common.decorators import render, ajax  
252 -  
253 -@render('entry.html')  
254 -@ajax(method='get', encode_result=False)  
255 -def entry(request, lemma, pos):  
256 - error = ''  
257 - lemma_id = -1  
258 - try: # status jeszcze tutaj wykorzystac  
259 - lemma_obj = Lemma.objects.get(entry_obj__name=lemma, entry_obj__pos__tag=pos,  
260 - old=False, status__in=get_ready_statuses())  
261 - lemma_id = lemma_obj.id  
262 - except Lemma.DoesNotExist:  
263 - error = 'Hasło nie istnieje w Walentym.'  
264 -  
265 - if not request.session.has_key('lemma_from_note_entry'):  
266 - request.session['lemma_from_note_entry'] = ''  
267 - if not request.session.has_key('lemma_from_note_id'):  
268 - request.session['lemma_from_note_id'] = ''  
269 -  
270 - # sorting rules  
271 - if not request.session.has_key('sort_rules'):  
272 - request.session['sort_rules'] = default_sort_rules()  
273 - else:  
274 - if not 'id' in request.session['sort_rules']:  
275 - request.session['sort_rules']['id'] = {'priority': None, 'sort_order': 'desc'}  
276 - if not 'entry' in request.session['sort_rules']:  
277 - request.session['sort_rules']['entry'] = {'priority': None, 'sort_order': 'desc'}  
278 - if not 'owner' in request.session['sort_rules']:  
279 - request.session['sort_rules']['owner'] = {'priority': None, 'sort_order': 'desc'}  
280 - if not 'phraseologist' in request.session['sort_rules']:  
281 - request.session['sort_rules']['phraseologist'] = {'priority': None, 'sort_order': 'desc'}  
282 - if not 'semanticist' in request.session['sort_rules']:  
283 - request.session['sort_rules']['semanticist'] = {'priority': None, 'sort_order': 'desc'}  
284 - if not 'vocabulary' in request.session['sort_rules']:  
285 - request.session['sort_rules']['vocabulary'] = {'priority': None, 'sort_order': 'desc'}  
286 - if not 'status' in request.session['sort_rules']:  
287 - request.session['sort_rules']['status'] = {'priority': None, 'sort_order': 'desc'}  
288 -  
289 - if not request.session.has_key('sort_rules_lemma_preview'):  
290 - request.session['sort_rules_lemma_preview'] = default_sort_rules()  
291 - else:  
292 - if not 'id' in request.session['sort_rules_lemma_preview']:  
293 - request.session['sort_rules_lemma_preview']['id'] = {'priority': None, 'sort_order': 'desc'}  
294 - if not 'entry' in request.session['sort_rules_lemma_preview']:  
295 - request.session['sort_rules_lemma_preview']['entry'] = {'priority': None, 'sort_order': 'desc'}  
296 - if not 'owner' in request.session['sort_rules_lemma_preview']:  
297 - request.session['sort_rules_lemma_preview']['owner'] = {'priority': None, 'sort_order': 'desc'}  
298 - if not 'phraseologist' in request.session['sort_rules_lemma_preview']:  
299 - request.session['sort_rules_lemma_preview']['phraseologist'] = {'priority': None, 'sort_order': 'desc'}  
300 - if not 'semanticist' in request.session['sort_rules_lemma_preview']:  
301 - request.session['sort_rules_lemma_preview']['semanticist'] = {'priority': None, 'sort_order': 'desc'}  
302 - if not 'vocabulary' in request.session['sort_rules_lemma_preview']:  
303 - request.session['sort_rules_lemma_preview']['vocabulary'] = {'priority': None, 'sort_order': 'desc'}  
304 - if not 'status' in request.session['sort_rules_lemma_preview']:  
305 - request.session['sort_rules_lemma_preview']['status'] = {'priority': None, 'sort_order': 'desc'}  
306 -  
307 - if (not request.session.has_key('filter_rules') or  
308 - not all_filter_rules_loaded(request.session['filter_rules'])):  
309 - request.session['filter_rules'] = default_filter_rules()  
310 -  
311 - if (not request.session.has_key('filter_rules_lemma_preview') or  
312 - not all_filter_rules_loaded(request.session['filter_rules_lemma_preview'])):  
313 - request.session['filter_rules_lemma_preview'] = default_filter_rules()  
314 -  
315 - if not request.session.has_key('lemma_preview'):  
316 - request.session['lemma_preview'] = False  
317 -  
318 - if not request.session.has_key('similar_lemmas'):  
319 - request.session['similar_lemmas'] = ''  
320 -  
321 - ordered_sort_rules = order_sort_rules(request.session['sort_rules'])  
322 - pos_cat_vals_objs = PositionCategory.objects.order_by('priority')  
323 - pos_cat_vals_tab = []  
324 - for pos_cat_val_obj in pos_cat_vals_objs:  
325 - pos_cat_vals_tab.append(pos_cat_val_obj.category)  
326 -  
327 - nkjp_opinion_vals_tab = []  
328 - nkjp_opinion_objs = NKJP_Opinion.objects.order_by('priority')  
329 - for opinion in nkjp_opinion_objs:  
330 - nkjp_opinion_vals_tab.append(opinion.opinion)  
331 -  
332 - nkjp_source_vals_tab = []  
333 - nkjp_source_objs = NKJP_Source.objects.order_by('priority')  
334 - for source in nkjp_source_objs:  
335 - nkjp_source_vals_tab.append(source.source)  
336 -  
337 - main_sort_field = ordered_sort_rules[0]['name']  
338 - main_sort_order = ordered_sort_rules[0]['rules']['sort_order']  
339 -  
340 - if request.user.is_authenticated():  
341 - auto_search = UserSettings.objects.get(user=request.user).incremental_search  
342 - else:  
343 - auto_search = False  
344 -  
345 - js_vars = {  
346 - 'ajax_get_page': reverse('get_lemmas'),  
347 - 'ajax_old_frames': reverse('get_old_frames'),  
348 - 'ajax_new_frames': reverse('get_new_frames'),  
349 - 'ajax_change_ctrl': reverse('get_change_ctrl'),  
350 - 'ajax_lemma_examples': reverse('get_lemma_examples'),  
351 - 'ajax_lemma_status': reverse('get_lemma_status'),  
352 - 'ajax_lemma_notes': reverse('get_lemma_notes'),  
353 - 'ajax_lemma_preview': reverse('get_lemma_preview'),  
354 - 'ajax_get_frame_filter_options': reverse('get_frame_filter_options'),  
355 - 'ajax_get_lemma_desc': reverse('get_lemma_desc'),  
356 - 'ajax_get_actual_lemma_id': reverse('get_actual_lemma_id'),  
357 - 'ajax_user_is_authenticated': reverse('user_is_authenticated'),  
358 -  
359 - 'ajax_semantics': reverse('semantics.views.ajax_semantics'),  
360 -  
361 - 'ajax_get_note_text': reverse('get_note_text'),  
362 - 'ajax_lemma_notes_form_submit': reverse('lemma_notes_form_submit'),  
363 - 'ajax_status_need_validation': reverse('status_need_validation'),  
364 - 'ajax_lemma_status_change': reverse('lemma_status_change'),  
365 - 'ajax_send_miss_frames_msg': reverse('send_miss_frames_msg'),  
366 - 'ajax_position_form': reverse('position_form'),  
367 -  
368 - 'ajax_position_lookup': reverse('position_lookup'),  
369 - 'ajax_argument_lookup': reverse('argument_lookup'),  
370 - 'ajax_argument_form': reverse('argument_form'),  
371 - 'ajax_argument_form_submit': reverse('argument_form_submit'),  
372 - 'ajax_add_position': reverse('add_position'),  
373 - 'ajax_create_position_form': reverse('create_position_form'),  
374 - 'ajax_create_position_form_submit': reverse('create_position_form_submit'),  
375 - 'ajax_save_new_frames': reverse('save_new_frames'),  
376 - 'ajax_get_ctrl_preview': reverse('get_ctrl_preview'),  
377 - 'ajax_restore_lemma': reverse('restore_lemma'),  
378 - 'ajax_frame_form': reverse('frame_form'),  
379 - 'ajax_aspect_rel_missing_frames': reverse('aspect_rel_missing_frames'),  
380 - 'ajax_add_new_frames': reverse('add_new_frames'),  
381 - 'ajax_show_skladnica_examples': reverse('show_skladnica_examples'),  
382 - 'ajax_show_frame_realizations': reverse('show_frame_realizations'),  
383 - 'ajax_frame_form_submit': reverse('frame_form_submit'),  
384 - 'ajax_pos_cat_form': reverse('pos_cat_form'),  
385 - 'ajax_can_add_position_category': reverse('can_add_position_category'),  
386 - 'ajax_pos_cat_form_submit': reverse('pos_cat_form_submit'),  
387 - 'ajax_skladnica_example_propositions': reverse('skladnica_example_propositions'),  
388 - 'ajax_xcp_example_propositions': reverse('xcp_example_propositions'),  
389 - 'ajax_nkjp_example_form_submit': reverse('nkjp_example_form_submit'),  
390 - 'ajax_semantic_example_form_submit': reverse('semantic_example_form_submit'),  
391 - 'ajax_remove_example_from_lemma': reverse('remove_example_from_lemma'),  
392 - 'ajax_get_skladnica_example': reverse('get_skladnica_example'),  
393 - 'ajax_get_xcp_example': reverse('get_xcp_example'),  
394 - 'ajax_get_frame_chars': reverse('get_frame_chars'),  
395 - 'ajax_example_opinion_form': reverse('example_opinion_form'),  
396 - 'ajax_example_opinion_form_submit': reverse('example_opinion_form_submit'),  
397 - 'ajax_can_confirm_example': reverse('can_confirm_example'),  
398 - 'ajax_confirm_nkjp_example': reverse('confirm_nkjp_example'),  
399 - 'ajax_location': reverse('get_location'),  
400 - 'ajax_note_session_get': reverse('note_session_get'),  
401 - 'ajax_note_session_clear': reverse('note_session_clear'),  
402 - 'ajax_remove_lemma_note': reverse('remove_lemma_note'),  
403 - 'ajax_lemma_note_form': reverse('lemma_note_form'),  
404 - 'ajax_get_lemma_note': reverse('get_lemma_note'),  
405 - 'ajax_lemma_notes_modify': reverse('lemma_notes_modify'),  
406 - 'ajax_frame_conversion_form': reverse('frame_conversion_form'),  
407 - 'ajax_frame_conversion_form_submit': reverse('frame_conversion_form_submit'),  
408 - 'ajax_need_conversion': reverse('need_conversion'),  
409 - 'ajax_get_compatible_schema_chars': reverse('get_compatible_schema_chars'),  
410 -  
411 - 'ajax_deselect_preview_tab': reverse('deselect_preview_tab'),  
412 - 'ajax_get_schemata': reverse('get_schemata'),  
413 - 'ajax_get_examples': reverse('get_examples'),  
414 - 'ajax_get_schemata_and_examples': reverse('get_schemata_and_examples'),  
415 -  
416 - # powiazywanie hasel (nieczasownikowe)  
417 - 'ajax_relate_entries': reverse('relate_entries'),  
418 - 'ajax_disrelate_entries': reverse('disrelate_entries'),  
419 - 'ajax_are_new_preview_entries_related': reverse('are_new_preview_entries_related'),  
420 -  
421 - # filtry, sortowania, ukrywanie elementow tabeli  
422 - 'ajax_sort_form': reverse('sort_form'),  
423 - 'ajax_filter_form': reverse('filter_form'),  
424 - 'ajax_sort_form_submit': reverse('sort_form_submit'),  
425 - 'ajax_filter_form_submit': reverse('filter_form_submit'),  
426 - 'ajax_sort_column': reverse('sort_column'),  
427 - 'ajax_save_columns': reverse('save_columns'),  
428 - 'ajax_save_columns': reverse('save_columns'),  
429 - 'ajax_get_sort_order': reverse('get_sort_order'),  
430 - 'ajax_sem_arg_form': reverse('sem_arg_form'),  
431 - 'ajax_general_preference_form': reverse('general_preference_form'),  
432 - 'ajax_synset_preference_form': reverse('synset_preference_form'),  
433 - 'ajax_relational_preference_form': reverse('relational_preference_form'),  
434 - 'ajax_synset_context_lookup': reverse('synset_context_lookup'),  
435 -  
436 - # czasowniki podobne  
437 - 'ajax_similar_lemmas_old_form_submit': reverse('similar_lemmas_old_form_submit'),  
438 - 'ajax_similar_lemmas_new_form_submit': reverse('similar_lemmas_new_form_submit'),  
439 - 'ajax_similar_lemmas_show_synonyms': reverse('similar_lemmas_show_synonyms'),  
440 - 'ajax_related_lemmas_show': reverse('related_lemmas_show'),  
441 - 'ajax_similar_lemmas_reset': reverse('similar_lemmas_reset'),  
442 - 'ajax_preview_select': reverse('preview_select'),  
443 -  
444 - # walidacja  
445 - 'ajax_validate_new_frames': reverse('validate_new_frames'),  
446 - 'ajax_validate_semantics': reverse('validate_semantics'),  
447 -  
448 - # modyfikacja przykladow nkjp  
449 - 'ajax_get_nkjp_dict_ids': reverse('get_nkjp_dict_ids'),  
450 -  
451 - # pokazywanie realizacji  
452 - 'ajax_show_realizations': reverse('show_realizations'),  
453 -  
454 - # uprawnienia  
455 - 'ajax_user_has_perm': reverse('user_has_perm'),  
456 -  
457 - # frazeologia  
458 - # 'ajax_has_lexicalized_args': reverse('has_lexicalized_args'),  
459 - 'ajax_phraseologic_propositions_exists': reverse('phraseologic_propositions_exists'),  
460 - 'ajax_arg_can_be_lexicalized': reverse('arg_can_be_lexicalized'),  
461 - 'ajax_assign_phraseologic_frame_form': reverse('assign_phraseologic_frame_form'),  
462 - 'ajax_assign_phraseologic_frame': reverse('assign_phraseologic_frame'),  
463 - 'ajax_entry_lookup': reverse('entry_lookup'),  
464 -  
465 - # inne  
466 - 'ajax_get_arg_id': reverse('get_arg_id'),  
467 -  
468 - # zmienne  
469 - 'ax_main_field': main_sort_field,  
470 - 'ax_sort_order': main_sort_order,  
471 - 'ax_pos_cat_vals': pos_cat_vals_tab,  
472 - 'ax_nkjp_opinion_vals': nkjp_opinion_vals_tab,  
473 - 'ax_nkjp_source_vals': nkjp_source_vals_tab,  
474 - 'ax_auto_search': auto_search,  
475 -  
476 - 'ax_initialColNames': get_grid_col_names(request.user),  
477 - 'ax_initialColModel': get_grid_col_models(request.user)  
478 - }  
479 - show_cols_variables = ('colModel', 'colNames', 'remap')  
480 - for var in show_cols_variables:  
481 - if var in request.session:  
482 - js_vars[var] = request.session[var]  
483 -  
484 - js_vars['lemma'] = lemma_id  
485 - js_vars['error'] = error  
486 -  
487 - return {'js_vars': js_vars}  
488 -  
489 -  
490 -  
491 def get_grid_col_names(user): 249 def get_grid_col_names(user):
492 if user.is_authenticated(): 250 if user.is_authenticated():
493 names = ['Id', 'Hasło', 'Właściciel', 'Frazeolog', 'Semantyk', 'Słownik', 'Status'] 251 names = ['Id', 'Hasło', 'Właściciel', 'Frazeolog', 'Semantyk', 'Słownik', 'Status']
@@ -497,55 +255,55 @@ def get_grid_col_names(user): @@ -497,55 +255,55 @@ def get_grid_col_names(user):
497 255
498 def get_grid_col_models(user): 256 def get_grid_col_models(user):
499 if user.is_authenticated(): 257 if user.is_authenticated():
500 - col_models = [{  
501 - 'name': 'id', 258 + col_models = [{
  259 + 'name': 'id',
502 'index': 'id', 260 'index': 'id',
503 - 'search': False,  
504 - 'hidden': True, 261 + 'search': False,
  262 + 'hidden': True,
505 'sortable': True 263 'sortable': True
506 }, 264 },
507 { 265 {
508 - 'name': 'entry', 266 + 'name': 'entry',
509 'index': 'entry', 267 'index': 'entry',
510 - 'search': False, 268 + 'search': False,
511 'hidden': False, 269 'hidden': False,
512 'sortable': True 270 'sortable': True
513 }, 271 },
514 { 272 {
515 'name': 'owner', 273 'name': 'owner',
516 'index': 'owner', 274 'index': 'owner',
517 - 'search': False,  
518 - 'hidden': not user.groups.filter(Q(name=u'Leksykograf') | 275 + 'search': False,
  276 + 'hidden': not user.groups.filter(Q(name=u'Leksykograf') |
519 Q(name=u'Superleksykograf')).exists(), 277 Q(name=u'Superleksykograf')).exists(),
520 'sortable': True 278 'sortable': True
521 }, 279 },
522 { 280 {
523 'name': 'phraseologist', 281 'name': 'phraseologist',
524 'index': 'phraseologist', 282 'index': 'phraseologist',
525 - 'search': False,  
526 - 'hidden': not user.groups.filter(Q(name=u'Frazeolog') | 283 + 'search': False,
  284 + 'hidden': not user.groups.filter(Q(name=u'Frazeolog') |
527 Q(name=u'Superfrazeolog')).exists(), 285 Q(name=u'Superfrazeolog')).exists(),
528 'sortable': True 286 'sortable': True
529 }, 287 },
530 { 288 {
531 'name': 'semanticist', 289 'name': 'semanticist',
532 'index': 'semanticist', 290 'index': 'semanticist',
533 - 'search': False,  
534 - 'hidden': not user.groups.filter(Q(name=u'Semantyk') | 291 + 'search': False,
  292 + 'hidden': not user.groups.filter(Q(name=u'Semantyk') |
535 Q(name=u'Supersemantyk')).exists(), 293 Q(name=u'Supersemantyk')).exists(),
536 'sortable': True 294 'sortable': True
537 }, 295 },
538 { 296 {
539 'name': 'vocabulary', 297 'name': 'vocabulary',
540 'index': 'vocabulary', 298 'index': 'vocabulary',
541 - 'search': False, 299 + 'search': False,
542 'hidden': False, 300 'hidden': False,
543 'sortable': True 301 'sortable': True
544 }, 302 },
545 { 303 {
546 'name': 'status', 304 'name': 'status',
547 'index': 'status', 305 'index': 'status',
548 - 'search': False, 306 + 'search': False,
549 'hidden': False, 307 'hidden': False,
550 'sortable': True 308 'sortable': True
551 } 309 }
@@ -553,22 +311,93 @@ def get_grid_col_models(user): @@ -553,22 +311,93 @@ def get_grid_col_models(user):
553 else: 311 else:
554 col_models = [ 312 col_models = [
555 { 313 {
556 - 'name': 'entry', 314 + 'name': 'entry',
557 'index': 'entry', 315 'index': 'entry',
558 - 'search': False, 316 + 'search': False,
559 'hidden': False, 317 'hidden': False,
560 'sortable': True 318 'sortable': True
561 }, 319 },
562 { 320 {
563 'name': 'status', 321 'name': 'status',
564 'index': 'status', 322 'index': 'status',
565 - 'search': False, 323 + 'search': False,
566 'hidden': False, 324 'hidden': False,
567 'sortable': True 325 'sortable': True
568 } 326 }
569 ] 327 ]
570 return col_models 328 return col_models
571 329
  330 +@render('entry.html')
  331 +@ajax(method='get', encode_result=False)
  332 +def entry(request, lemma, pos):
  333 + error = ''
  334 + lemma_id = -1
  335 + semantics_ready = False
  336 + try:
  337 + lemma_obj = Lemma.objects.get(entry_obj__name=lemma, entry_obj__pos__tag=pos,
  338 + old=False, status__in=get_ready_statuses())
  339 + lemma_id = lemma_obj.id
  340 + semantics_ready = lemma_obj.semantics_ready()
  341 + except Lemma.DoesNotExist:
  342 + error = 'Hasło nie istnieje w Walentym.'
  343 +
  344 + nkjp_opinion_vals_tab = []
  345 + nkjp_opinion_objs = NKJP_Opinion.objects.order_by('priority')
  346 + for opinion in nkjp_opinion_objs:
  347 + nkjp_opinion_vals_tab.append(opinion.opinion)
  348 +
  349 + nkjp_source_vals_tab = []
  350 + nkjp_source_objs = NKJP_Source.objects.order_by('priority')
  351 + for source in nkjp_source_objs:
  352 + nkjp_source_vals_tab.append(source.source)
  353 +
  354 + js_vars = {
  355 + 'ajax_lemma_examples': reverse('get_lemma_examples'),
  356 + 'ajax_get_lemma_desc': reverse('get_lemma_desc'),
  357 + 'ajax_new_frames': reverse('get_new_frames'),
  358 + 'ajax_get_frame_filter_options': reverse('get_frame_filter_options'),
  359 + 'ajax_user_is_authenticated': reverse('user_is_authenticated'),
  360 + 'ajax_semantics': reverse('semantics.views.ajax_semantics'),
  361 + 'ajax_position_lookup': reverse('position_lookup'),
  362 + 'ajax_argument_lookup': reverse('argument_lookup'),
  363 + 'ajax_skladnica_example_propositions': reverse('skladnica_example_propositions'),
  364 + 'ajax_xcp_example_propositions': reverse('xcp_example_propositions'),
  365 + 'ajax_can_confirm_example': reverse('can_confirm_example'),
  366 + 'ajax_get_schemata_and_examples': reverse('get_schemata_and_examples'),
  367 + 'ajax_deselect_preview_tab': reverse('deselect_preview_tab'),
  368 +
  369 + # modyfikacja przykladow nkjp
  370 + 'ajax_get_nkjp_dict_ids': reverse('get_nkjp_dict_ids'),
  371 +
  372 + # powiazywanie hasel (nieczasownikowe)
  373 + 'ajax_are_new_preview_entries_related': reverse('are_new_preview_entries_related'),
  374 +
  375 + # czasowniki podobne
  376 + 'ajax_preview_select': reverse('preview_select'),
  377 +
  378 + # uprawnienia
  379 + 'ajax_user_has_perm': reverse('user_has_perm'),
  380 +
  381 + # zmienne
  382 + 'ax_main_field': '',
  383 + 'ax_sort_order': '',
  384 + 'ax_nkjp_opinion_vals': nkjp_opinion_vals_tab,
  385 + 'ax_nkjp_source_vals': nkjp_source_vals_tab,
  386 +
  387 + 'ax_initialColNames': [],
  388 + 'ax_initialColModel': [],
  389 +
  390 + 'lemma': lemma_id,
  391 + 'error': error
  392 + }
  393 +
  394 + to_return = {
  395 + 'js_vars': js_vars,
  396 + 'semantics_ready': semantics_ready
  397 + }
  398 +
  399 + return to_return
  400 +
572 @render('manage_vocabularies.html') 401 @render('manage_vocabularies.html')
573 def manage_vocabulary(request): 402 def manage_vocabulary(request):
574 to_return = {} 403 to_return = {}
static/css/general.css
@@ -160,7 +160,13 @@ li { @@ -160,7 +160,13 @@ li {
160 } 160 }
161 161
162 162
163 -/* splittbar */ 163 +/* splittbars */
  164 +
  165 +.vsplitbar {
  166 + width: 7px;
  167 + background: #bbc;
  168 +}
  169 +
164 .hsplitbar { 170 .hsplitbar {
165 height: 7px; 171 height: 7px;
166 background: #bbc; 172 background: #bbc;
static/js/entry-layout.js
1 -var myLayout;  
2 -var change = false;  
3 -var notesNotSaved = false;  
4 -var lemmaExNotSaved = false;  
5 -var frames_operations = [];  
6 -  
7 -$(window).bind('beforeunload', function() {  
8 - warnings = ""  
9 - if(change)  
10 - warnings = warnings + " - Nie zapisano zmian w schematach składniowych.\n";  
11 - if(typeof semanticsChanged != "undefined" && semanticsChanged())  
12 - warnings = warnings + " - Nie zapisano zmian w ramach semantycznych.\n";  
13 - if(notesNotSaved)  
14 - warnings = warnings + " - Nie zapisano notatki.\n";  
15 - if(lemmaExNotSaved)  
16 - warnings = warnings + " - Nie zapisano przykładu niedowiązangeo.\n";  
17 - if(warnings)  
18 - return "Uwaga:\n" + warnings  
19 - });  
20 -  
21 $(function() { 1 $(function() {
22 $('#content').height($(window).height() - 20); 2 $('#content').height($(window).height() - 20);
23 $(window).resize(function() { 3 $(window).resize(function() {
@@ -35,13 +15,11 @@ $(function() { @@ -35,13 +15,11 @@ $(function() {
35 } 15 }
36 }); 16 });
37 17
38 -function ShowProgressAnimation()  
39 -{ 18 +function ShowProgressAnimation() {
40 $("#wait-dialog").dialog('open'); 19 $("#wait-dialog").dialog('open');
41 } 20 }
42 21
43 -function HideProgressAnimation()  
44 -{ 22 +function HideProgressAnimation() {
45 $("#wait-dialog").dialog('close'); 23 $("#wait-dialog").dialog('close');
46 } 24 }
47 25
@@ -49,8 +27,7 @@ function resize_splitters() { @@ -49,8 +27,7 @@ function resize_splitters() {
49 $('#semantics-hsplit').trigger('resize'); 27 $('#semantics-hsplit').trigger('resize');
50 } 28 }
51 29
52 -function createWaitDialog()  
53 -{ 30 +function createWaitDialog() {
54 $("#wait-dialog").dialog({ autoOpen: false, 31 $("#wait-dialog").dialog({ autoOpen: false,
55 modal : 'true', 32 modal : 'true',
56 closeOnEscape: 'false', 33 closeOnEscape: 'false',
@@ -66,36 +43,9 @@ function createWaitDialog() @@ -66,36 +43,9 @@ function createWaitDialog()
66 function refresh_column_headers() {} 43 function refresh_column_headers() {}
67 44
68 function load_content(id) { 45 function load_content(id) {
69 - $('#add-table-elem-dialog').dialog('close');  
70 - if(lemma_id != id)  
71 - $('#ready-note-dialog').dialog('close');  
72 - initiateFrameFilters(); 46 + initiateFrameFilters();
73 47
74 ShowProgressAnimation(); 48 ShowProgressAnimation();
75 - // czyszczenie wartosci  
76 - window.elem_in_bucket = '';  
77 - window.selected_notes_row_id = -1;  
78 - window.selected_id = -1;  
79 - window.prev_selected_id = -1;  
80 - window.edited_id = -1;  
81 - window.manipulated_id = -1;  
82 - window.new_elem_id = -2;  
83 - window.copy_elem_id = -1;  
84 - window.activeNewFramePanel = 'frames_modif';  
85 - window.selectedArgumentsIdNkjp = new Array();  
86 - window.selectedFrameIdNkjp = -1;  
87 - window.nkjp_examples = new Array();  
88 - window.curr_example_id = -1;  
89 - window.selected_example_id = -1;  
90 - window.lemma_nkjp_examples = new Array();  
91 - window.curr_lemma_example_id = -1;  
92 - window.selected_lemma_example_id = -1;  
93 - window.addedFrame = '';  
94 -  
95 - $('#new_frames').empty();  
96 - window.change = false;  
97 - window.notesNotSaved = false;  
98 - window.lemmaExNotSaved = false;  
99 49
100 $('#new_frames').load(ajax_new_frames, 'id='+id, function(data){ 50 $('#new_frames').load(ajax_new_frames, 'id='+id, function(data){
101 window.lemma_id = id; 51 window.lemma_id = id;
@@ -104,16 +54,13 @@ function load_content(id) { @@ -104,16 +54,13 @@ function load_content(id) {
104 54
105 createSplitter('framesSplit','new-frame-tables', 'tabs'); 55 createSplitter('framesSplit','new-frame-tables', 'tabs');
106 56
107 - if(document.getElementById("lemma_example_show"))  
108 - { 57 + if(document.getElementById("lemma_example_show")) {
109 draw_nkjp_table(document.getElementById("lemma_example_show"), '', window.nkjp_lemma_examples, 'NkjpLemmaTableRow', 'nkjpLemma_') 58 draw_nkjp_table(document.getElementById("lemma_example_show"), '', window.nkjp_lemma_examples, 'NkjpLemmaTableRow', 'nkjpLemma_')
110 $("tr.NkjpLemmaTableRow").click(function(){ 59 $("tr.NkjpLemmaTableRow").click(function(){
111 selectLemmaNkjpTr(this.id)}); 60 selectLemmaNkjpTr(this.id)});
112 } 61 }
113 addPinnedExamplesDialog(); 62 addPinnedExamplesDialog();
114 $('#lemma_desc').load(ajax_get_lemma_desc, 'id='+id); 63 $('#lemma_desc').load(ajax_get_lemma_desc, 'id='+id);
115 - areNewPreviewEntriesRelated();  
116 - refresh_example_propositions();  
117 }); 64 });
118 $('#semantics').load(ajax_semantics, 'id='+id); 65 $('#semantics').load(ajax_semantics, 'id='+id);
119 } 66 }
@@ -140,7 +87,6 @@ function createSplitter(split_id, top_id, bottom_id) { @@ -140,7 +87,6 @@ function createSplitter(split_id, top_id, bottom_id) {
140 } 87 }
141 } 88 }
142 89
143 -  
144 var hSplitterId = 'semantics-hsplit'; 90 var hSplitterId = 'semantics-hsplit';
145 var topSplitId = 'semantics-hsplit-top'; 91 var topSplitId = 'semantics-hsplit-top';
146 var bottomSplitId = 'semantics-hsplit-bottom'; 92 var bottomSplitId = 'semantics-hsplit-bottom';
@@ -149,7 +95,6 @@ var bottomVSplitterId = 'semantics-vsplit-bottom'; @@ -149,7 +95,6 @@ var bottomVSplitterId = 'semantics-vsplit-bottom';
149 var topLeftSplitId = 'frames'; 95 var topLeftSplitId = 'frames';
150 var topRightSplitId = 'schemas'; 96 var topRightSplitId = 'schemas';
151 var bottomLeftSplitId = 'control'; 97 var bottomLeftSplitId = 'control';
152 -var bottomRightSplitId = 'semantics-examples';  
153 98
154 function createHSplitter() { 99 function createHSplitter() {
155 $('#'+hSplitterId).height($('#content').height() - 50); 100 $('#'+hSplitterId).height($('#content').height() - 50);
@@ -222,30 +167,3 @@ function createVTopSplitter() { @@ -222,30 +167,3 @@ function createVTopSplitter() {
222 }); 167 });
223 } 168 }
224 } 169 }
225 -  
226 -function createVBottomSplitter() {  
227 - var w=$('#'+bottomVSplitterId).width();  
228 - $('#'+bottomVSplitterId).height($('#content').height()/3);  
229 - if ($.fn.splitter) {  
230 - $('#'+bottomLeftSplitId).bind('resize', function(e) {  
231 - $('#'+bottomVSplitterId).height($('#'+bottomSplitId).height());  
232 - $('#'+bottomVSplitterId).children().each(function () {  
233 - $(this).height($('#'+bottomSplitId).height()-7);  
234 - });  
235 -  
236 - $('#'+bottomLeftSplitId).width($('#'+bottomLeftSplitId).width() - 7);  
237 - $('#'+bottomRightSplitId).width($('#'+bottomRightSplitId).width() - 20);  
238 - e.stopPropagation();  
239 - });  
240 - $('#'+bottomRightSplitId).bind('resize', function(e) {  
241 - e.stopPropagation();  
242 - });  
243 - $('#'+bottomVSplitterId).splitter({  
244 - type: "v",  
245 - sizeLeft: w/3,  
246 - minLeft: 200,  
247 - resizeToWidth: true,  
248 - outline: true  
249 - });  
250 - }  
251 -}  
templates/base.html
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 {% block nav-global %}{% endblock %} 76 {% block nav-global %}{% endblock %}
77 {% if messages %} 77 {% if messages %}
78 <ul class="messagelist">{% for message in messages %} 78 <ul class="messagelist">{% for message in messages %}
79 - <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li> 79 + <li>{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
80 {% endfor %}</ul> 80 {% endfor %}</ul>
81 {% endif %} 81 {% endif %}
82 </div> 82 </div>
templates/entry.html
@@ -20,13 +20,7 @@ @@ -20,13 +20,7 @@
20 <link rel="shortcut icon" href="{{STATIC_URL}}images/favicon.ico" type="image/png"/> 20 <link rel="shortcut icon" href="{{STATIC_URL}}images/favicon.ico" type="image/png"/>
21 <link rel="stylesheet" href="{{ STATIC_URL }}css/lib/smoothness/jquery-ui-1.8.20.custom.css" type="text/css" media="screen" charset="utf-8" /> 21 <link rel="stylesheet" href="{{ STATIC_URL }}css/lib/smoothness/jquery-ui-1.8.20.custom.css" type="text/css" media="screen" charset="utf-8" />
22 <link rel="stylesheet" href="{{ STATIC_URL }}css/general.css" type="text/css" media="screen" charset="utf-8" /> 22 <link rel="stylesheet" href="{{ STATIC_URL }}css/general.css" type="text/css" media="screen" charset="utf-8" />
23 -<link rel="stylesheet" href="{{ STATIC_URL }}css/status_table.css" type="text/css" media="screen" charset="utf-8" />  
24 -<link rel="stylesheet" href="{{ STATIC_URL }}css/vocabulary_stats.css" type="text/css" media="screen" charset="utf-8" />  
25 -<link rel="stylesheet" href="{{ STATIC_URL }}css/user_stats.css" type="text/css" media="screen" charset="utf-8" />  
26 <link rel="stylesheet" href="{{ STATIC_URL }}css/frame_table.css" type="text/css" media="screen" charset="utf-8" /> 23 <link rel="stylesheet" href="{{ STATIC_URL }}css/frame_table.css" type="text/css" media="screen" charset="utf-8" />
27 -<link rel="stylesheet" href="{{ STATIC_URL }}css/arg_realization_table.css" type="text/css" media="screen" charset="utf-8" />  
28 -<link rel="stylesheet" href="{{ STATIC_URL }}css/arg_realization_viewtab.css" type="text/css" media="screen" charset="utf-8" />  
29 -<link rel="stylesheet" href="{{ STATIC_URL }}css/all_notes_table.css" type="text/css" media="screen" charset="utf-8" />  
30 24
31 <script> 25 <script>
32 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ 26 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -49,60 +43,46 @@ @@ -49,60 +43,46 @@
49 }); 43 });
50 </script> 44 </script>
51 45
52 - <link rel="stylesheet" href="{{ STATIC_URL }}css/lib/ui.jqgrid.css" type="text/css" media="screen" charset="utf-8" />  
53 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/lib/jquery.multiselect.css"/>  
54 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jqgrid.css"/>  
55 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/change_ctrl_table.css"/>  
56 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/examples_table.css"/>  
57 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/aspect_relations_table.css"/>  
58 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/filter_frames_menu.css"/>  
59 - <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/lemmas_filtering.css"/>  
60 - <script type="text/javascript" src="{{ STATIC_URL }}js/lib/splitter.js"></script>  
61 - <script type="text/javascript" src="{{ STATIC_URL }}js/lib/jquery.multiselect.js"></script> 46 +<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/change_ctrl_table.css"/>
  47 +<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/examples_table.css"/>
  48 +<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/filter_frames_menu.css"/>
  49 +<script type="text/javascript" src="{{ STATIC_URL }}js/lib/splitter.js"></script>
  50 +<script type="text/javascript" src="{{ STATIC_URL }}js/lemma-view.js"></script>
  51 +<script type="text/javascript" src="{{ STATIC_URL }}js/entry-layout.js"></script>
  52 +<script type="text/javascript" src="{{ STATIC_URL }}js/schemata_filtering.js"></script>
62 53
63 - <script type="text/javascript" src="{{ STATIC_URL }}js/semantics_coupling.js"></script>  
64 - <script type="text/javascript" src="{{ STATIC_URL }}js/lemma-view.js"></script>  
65 - <script type="text/javascript" src="{{ STATIC_URL }}js/entry-layout.js"></script>  
66 - <script type="text/javascript" src="{{ STATIC_URL }}js/lemmas_filtering.js"></script>  
67 - <script type="text/javascript" src="{{ STATIC_URL }}js/schemata_filtering.js"></script>  
68 </head> 54 </head>
69 {% load i18n %} 55 {% load i18n %}
70 56
71 <body> 57 <body>
72 -<!-- Container -->  
73 -<!--div id="container"-->  
74 -  
75 - <!-- Header -->  
76 <div id="header"> 58 <div id="header">
77 </div> 59 </div>
78 - <!-- END Header -->  
79 - <!-- Content -->  
80 -<div id="content">  
81 - <div class="tabs">  
82 - <ul>  
83 - <li id="refresh_frames"><a href="#new_frames">{% trans "Składnia" %} [<span id="new-frames-count"></span>]</a></li>  
84 - <li><a href="#semantics">{% trans "Semantyka" %} [<span id="semantic-frames-count"></span>]</a></li>  
85 - <li><a href="#examples">{% trans "Przykłady" %} [<span id="lemma-examples-count"></span>]</a></li>  
86 - <li id="lemma_desc" style="float:right;"></li>  
87 - </ul>  
88 - <div id="new_frames">  
89 - </div>  
90 - <div id="semantics">  
91 - </div>  
92 - <div id="examples">  
93 - </div>  
94 - </div> 60 +
  61 + <div id="content">
  62 + <div class="tabs">
  63 + <ul>
  64 + <li id="refresh_frames"><a href="#new_frames">{% trans "Składnia" %} [<span id="new-frames-count"></span>]</a></li>
  65 + {% if semantics_ready %}
  66 + <li><a href="#semantics">{% trans "Semantyka" %} [<span id="semantic-frames-count"></span>]</a></li>
  67 + {% endif %}
  68 + <li><a href="#examples">{% trans "Przykłady" %} [<span id="lemma-examples-count"></span>]</a></li>
  69 + <li id="lemma_desc" style="float:right;"></li>
  70 + </ul>
  71 +
  72 + <div id="new_frames"></div>
  73 + {% if semantics_ready %}
  74 + <div id="semantics"></div>
  75 + {% endif %}
  76 + <div id="examples"></div>
  77 + </div>
95 </div> 78 </div>
96 - <!-- END Content -->  
97 79
98 - {% block footer %}<div id="footer"></div>{% endblock %}  
99 -<!--/div-->  
100 -<!-- END Container -->  
101 - <div id="wait-dialog">  
102 - <div id="progress" class="ui-corner-all" >  
103 - <h2 style="color:gray;font-weight:normal;">Proszę czekać....</h2>  
104 - </div>  
105 - </div> 80 + <div id="footer"></div>
  81 + <div id="wait-dialog">
  82 + <div id="progress" class="ui-corner-all" >
  83 + <h2 style="color:gray;font-weight:normal;">Proszę czekać....</h2>
  84 + </div>
  85 + </div>
106 86
107 </body> 87 </body>
108 </html> 88 </html>