From e71e2498333a93bc0789346d2fcd6f80542f9d36 Mon Sep 17 00:00:00 2001
From: bniton <bartek.niton@gmail.com>
Date: Wed, 22 Nov 2017 12:00:24 +0100
Subject: [PATCH] Cleaning unused entry view code.
---
dictionary/static/css/jqgrid.css | 5 -----
dictionary/static/css/lemma_view.css | 13 -------------
dictionary/views.py | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
static/css/general.css | 8 +++++++-
static/js/entry-layout.js | 92 +++++---------------------------------------------------------------------------------------
templates/base.html | 2 +-
templates/entry.html | 82 +++++++++++++++++++++++++++++++---------------------------------------------------
7 files changed, 136 insertions(+), 421 deletions(-)
delete mode 100644 dictionary/static/css/lemma_view.css
diff --git a/dictionary/static/css/jqgrid.css b/dictionary/static/css/jqgrid.css
index f2a7360..6a93849 100644
--- a/dictionary/static/css/jqgrid.css
+++ b/dictionary/static/css/jqgrid.css
@@ -39,11 +39,6 @@ ul li:hover ul {
display: none;
}
-.vsplitbar {
- width: 7px;
- background: #bbc;
-}
-
.ui-jqgrid .selected-row {
background-color: blue;
background-image: none;
diff --git a/dictionary/static/css/lemma_view.css b/dictionary/static/css/lemma_view.css
deleted file mode 100644
index f325a77..0000000
--- a/dictionary/static/css/lemma_view.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* splittbar */
-.hsplitbar {
- height: 7px;
- background: #bbc;
-}
-
-#framesSplit div {
- overflow: auto;
-}
-
-#prevFramesSplit div {
- overflow: auto;
-}
diff --git a/dictionary/views.py b/dictionary/views.py
index 1adb1eb..0b3d3b8 100644
--- a/dictionary/views.py
+++ b/dictionary/views.py
@@ -11,12 +11,12 @@ from django.http import HttpResponse
import settings
from accounts.models import UserSettings
-from common.decorators import render
+from common.decorators import render, ajax
from dictionary.ajax_jqgrid import default_sort_rules
from dictionary.filtering import all_filter_rules_loaded, default_filter_rules
-from dictionary.forms import UserCreateForm, GetVocabularyForm, ArgStatsForm
-from dictionary.models import PositionCategory, NKJP_Opinion, NKJP_Source, \
- Vocabulary, Message, RealizationType
+from dictionary.forms import UserCreateForm, GetVocabularyForm
+from dictionary.models import Lemma, PositionCategory, NKJP_Opinion, NKJP_Source, \
+ Vocabulary, Message, RealizationType, get_ready_statuses
from dictionary.ajax_lemma_view import getFrequentPositions, order_sort_rules
@@ -246,248 +246,6 @@ def lemma_view(request):
return {'js_vars': js_vars}
-
-from dictionary.models import Lemma, get_ready_statuses
-from common.decorators import render, ajax
-
-@render('entry.html')
-@ajax(method='get', encode_result=False)
-def entry(request, lemma, pos):
- error = ''
- lemma_id = -1
- try: # status jeszcze tutaj wykorzystac
- lemma_obj = Lemma.objects.get(entry_obj__name=lemma, entry_obj__pos__tag=pos,
- old=False, status__in=get_ready_statuses())
- lemma_id = lemma_obj.id
- except Lemma.DoesNotExist:
- error = 'Hasło nie istnieje w Walentym.'
-
- if not request.session.has_key('lemma_from_note_entry'):
- request.session['lemma_from_note_entry'] = ''
- if not request.session.has_key('lemma_from_note_id'):
- request.session['lemma_from_note_id'] = ''
-
- # sorting rules
- if not request.session.has_key('sort_rules'):
- request.session['sort_rules'] = default_sort_rules()
- else:
- if not 'id' in request.session['sort_rules']:
- request.session['sort_rules']['id'] = {'priority': None, 'sort_order': 'desc'}
- if not 'entry' in request.session['sort_rules']:
- request.session['sort_rules']['entry'] = {'priority': None, 'sort_order': 'desc'}
- if not 'owner' in request.session['sort_rules']:
- request.session['sort_rules']['owner'] = {'priority': None, 'sort_order': 'desc'}
- if not 'phraseologist' in request.session['sort_rules']:
- request.session['sort_rules']['phraseologist'] = {'priority': None, 'sort_order': 'desc'}
- if not 'semanticist' in request.session['sort_rules']:
- request.session['sort_rules']['semanticist'] = {'priority': None, 'sort_order': 'desc'}
- if not 'vocabulary' in request.session['sort_rules']:
- request.session['sort_rules']['vocabulary'] = {'priority': None, 'sort_order': 'desc'}
- if not 'status' in request.session['sort_rules']:
- request.session['sort_rules']['status'] = {'priority': None, 'sort_order': 'desc'}
-
- if not request.session.has_key('sort_rules_lemma_preview'):
- request.session['sort_rules_lemma_preview'] = default_sort_rules()
- else:
- if not 'id' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['id'] = {'priority': None, 'sort_order': 'desc'}
- if not 'entry' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['entry'] = {'priority': None, 'sort_order': 'desc'}
- if not 'owner' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['owner'] = {'priority': None, 'sort_order': 'desc'}
- if not 'phraseologist' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['phraseologist'] = {'priority': None, 'sort_order': 'desc'}
- if not 'semanticist' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['semanticist'] = {'priority': None, 'sort_order': 'desc'}
- if not 'vocabulary' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['vocabulary'] = {'priority': None, 'sort_order': 'desc'}
- if not 'status' in request.session['sort_rules_lemma_preview']:
- request.session['sort_rules_lemma_preview']['status'] = {'priority': None, 'sort_order': 'desc'}
-
- if (not request.session.has_key('filter_rules') or
- not all_filter_rules_loaded(request.session['filter_rules'])):
- request.session['filter_rules'] = default_filter_rules()
-
- if (not request.session.has_key('filter_rules_lemma_preview') or
- not all_filter_rules_loaded(request.session['filter_rules_lemma_preview'])):
- request.session['filter_rules_lemma_preview'] = default_filter_rules()
-
- if not request.session.has_key('lemma_preview'):
- request.session['lemma_preview'] = False
-
- if not request.session.has_key('similar_lemmas'):
- request.session['similar_lemmas'] = ''
-
- ordered_sort_rules = order_sort_rules(request.session['sort_rules'])
- pos_cat_vals_objs = PositionCategory.objects.order_by('priority')
- pos_cat_vals_tab = []
- for pos_cat_val_obj in pos_cat_vals_objs:
- pos_cat_vals_tab.append(pos_cat_val_obj.category)
-
- nkjp_opinion_vals_tab = []
- nkjp_opinion_objs = NKJP_Opinion.objects.order_by('priority')
- for opinion in nkjp_opinion_objs:
- nkjp_opinion_vals_tab.append(opinion.opinion)
-
- nkjp_source_vals_tab = []
- nkjp_source_objs = NKJP_Source.objects.order_by('priority')
- for source in nkjp_source_objs:
- nkjp_source_vals_tab.append(source.source)
-
- main_sort_field = ordered_sort_rules[0]['name']
- main_sort_order = ordered_sort_rules[0]['rules']['sort_order']
-
- if request.user.is_authenticated():
- auto_search = UserSettings.objects.get(user=request.user).incremental_search
- else:
- auto_search = False
-
- js_vars = {
- 'ajax_get_page': reverse('get_lemmas'),
- 'ajax_old_frames': reverse('get_old_frames'),
- 'ajax_new_frames': reverse('get_new_frames'),
- 'ajax_change_ctrl': reverse('get_change_ctrl'),
- 'ajax_lemma_examples': reverse('get_lemma_examples'),
- 'ajax_lemma_status': reverse('get_lemma_status'),
- 'ajax_lemma_notes': reverse('get_lemma_notes'),
- 'ajax_lemma_preview': reverse('get_lemma_preview'),
- 'ajax_get_frame_filter_options': reverse('get_frame_filter_options'),
- 'ajax_get_lemma_desc': reverse('get_lemma_desc'),
- 'ajax_get_actual_lemma_id': reverse('get_actual_lemma_id'),
- 'ajax_user_is_authenticated': reverse('user_is_authenticated'),
-
- 'ajax_semantics': reverse('semantics.views.ajax_semantics'),
-
- 'ajax_get_note_text': reverse('get_note_text'),
- 'ajax_lemma_notes_form_submit': reverse('lemma_notes_form_submit'),
- 'ajax_status_need_validation': reverse('status_need_validation'),
- 'ajax_lemma_status_change': reverse('lemma_status_change'),
- 'ajax_send_miss_frames_msg': reverse('send_miss_frames_msg'),
- 'ajax_position_form': reverse('position_form'),
-
- 'ajax_position_lookup': reverse('position_lookup'),
- 'ajax_argument_lookup': reverse('argument_lookup'),
- 'ajax_argument_form': reverse('argument_form'),
- 'ajax_argument_form_submit': reverse('argument_form_submit'),
- 'ajax_add_position': reverse('add_position'),
- 'ajax_create_position_form': reverse('create_position_form'),
- 'ajax_create_position_form_submit': reverse('create_position_form_submit'),
- 'ajax_save_new_frames': reverse('save_new_frames'),
- 'ajax_get_ctrl_preview': reverse('get_ctrl_preview'),
- 'ajax_restore_lemma': reverse('restore_lemma'),
- 'ajax_frame_form': reverse('frame_form'),
- 'ajax_aspect_rel_missing_frames': reverse('aspect_rel_missing_frames'),
- 'ajax_add_new_frames': reverse('add_new_frames'),
- 'ajax_show_skladnica_examples': reverse('show_skladnica_examples'),
- 'ajax_show_frame_realizations': reverse('show_frame_realizations'),
- 'ajax_frame_form_submit': reverse('frame_form_submit'),
- 'ajax_pos_cat_form': reverse('pos_cat_form'),
- 'ajax_can_add_position_category': reverse('can_add_position_category'),
- 'ajax_pos_cat_form_submit': reverse('pos_cat_form_submit'),
- 'ajax_skladnica_example_propositions': reverse('skladnica_example_propositions'),
- 'ajax_xcp_example_propositions': reverse('xcp_example_propositions'),
- 'ajax_nkjp_example_form_submit': reverse('nkjp_example_form_submit'),
- 'ajax_semantic_example_form_submit': reverse('semantic_example_form_submit'),
- 'ajax_remove_example_from_lemma': reverse('remove_example_from_lemma'),
- 'ajax_get_skladnica_example': reverse('get_skladnica_example'),
- 'ajax_get_xcp_example': reverse('get_xcp_example'),
- 'ajax_get_frame_chars': reverse('get_frame_chars'),
- 'ajax_example_opinion_form': reverse('example_opinion_form'),
- 'ajax_example_opinion_form_submit': reverse('example_opinion_form_submit'),
- 'ajax_can_confirm_example': reverse('can_confirm_example'),
- 'ajax_confirm_nkjp_example': reverse('confirm_nkjp_example'),
- 'ajax_location': reverse('get_location'),
- 'ajax_note_session_get': reverse('note_session_get'),
- 'ajax_note_session_clear': reverse('note_session_clear'),
- 'ajax_remove_lemma_note': reverse('remove_lemma_note'),
- 'ajax_lemma_note_form': reverse('lemma_note_form'),
- 'ajax_get_lemma_note': reverse('get_lemma_note'),
- 'ajax_lemma_notes_modify': reverse('lemma_notes_modify'),
- 'ajax_frame_conversion_form': reverse('frame_conversion_form'),
- 'ajax_frame_conversion_form_submit': reverse('frame_conversion_form_submit'),
- 'ajax_need_conversion': reverse('need_conversion'),
- 'ajax_get_compatible_schema_chars': reverse('get_compatible_schema_chars'),
-
- 'ajax_deselect_preview_tab': reverse('deselect_preview_tab'),
- 'ajax_get_schemata': reverse('get_schemata'),
- 'ajax_get_examples': reverse('get_examples'),
- 'ajax_get_schemata_and_examples': reverse('get_schemata_and_examples'),
-
- # powiazywanie hasel (nieczasownikowe)
- 'ajax_relate_entries': reverse('relate_entries'),
- 'ajax_disrelate_entries': reverse('disrelate_entries'),
- 'ajax_are_new_preview_entries_related': reverse('are_new_preview_entries_related'),
-
- # filtry, sortowania, ukrywanie elementow tabeli
- 'ajax_sort_form': reverse('sort_form'),
- 'ajax_filter_form': reverse('filter_form'),
- 'ajax_sort_form_submit': reverse('sort_form_submit'),
- 'ajax_filter_form_submit': reverse('filter_form_submit'),
- 'ajax_sort_column': reverse('sort_column'),
- 'ajax_save_columns': reverse('save_columns'),
- 'ajax_save_columns': reverse('save_columns'),
- 'ajax_get_sort_order': reverse('get_sort_order'),
- 'ajax_sem_arg_form': reverse('sem_arg_form'),
- 'ajax_general_preference_form': reverse('general_preference_form'),
- 'ajax_synset_preference_form': reverse('synset_preference_form'),
- 'ajax_relational_preference_form': reverse('relational_preference_form'),
- 'ajax_synset_context_lookup': reverse('synset_context_lookup'),
-
- # czasowniki podobne
- 'ajax_similar_lemmas_old_form_submit': reverse('similar_lemmas_old_form_submit'),
- 'ajax_similar_lemmas_new_form_submit': reverse('similar_lemmas_new_form_submit'),
- 'ajax_similar_lemmas_show_synonyms': reverse('similar_lemmas_show_synonyms'),
- 'ajax_related_lemmas_show': reverse('related_lemmas_show'),
- 'ajax_similar_lemmas_reset': reverse('similar_lemmas_reset'),
- 'ajax_preview_select': reverse('preview_select'),
-
- # walidacja
- 'ajax_validate_new_frames': reverse('validate_new_frames'),
- 'ajax_validate_semantics': reverse('validate_semantics'),
-
- # modyfikacja przykladow nkjp
- 'ajax_get_nkjp_dict_ids': reverse('get_nkjp_dict_ids'),
-
- # pokazywanie realizacji
- 'ajax_show_realizations': reverse('show_realizations'),
-
- # uprawnienia
- 'ajax_user_has_perm': reverse('user_has_perm'),
-
- # frazeologia
- # 'ajax_has_lexicalized_args': reverse('has_lexicalized_args'),
- 'ajax_phraseologic_propositions_exists': reverse('phraseologic_propositions_exists'),
- 'ajax_arg_can_be_lexicalized': reverse('arg_can_be_lexicalized'),
- 'ajax_assign_phraseologic_frame_form': reverse('assign_phraseologic_frame_form'),
- 'ajax_assign_phraseologic_frame': reverse('assign_phraseologic_frame'),
- 'ajax_entry_lookup': reverse('entry_lookup'),
-
- # inne
- 'ajax_get_arg_id': reverse('get_arg_id'),
-
- # zmienne
- 'ax_main_field': main_sort_field,
- 'ax_sort_order': main_sort_order,
- 'ax_pos_cat_vals': pos_cat_vals_tab,
- 'ax_nkjp_opinion_vals': nkjp_opinion_vals_tab,
- 'ax_nkjp_source_vals': nkjp_source_vals_tab,
- 'ax_auto_search': auto_search,
-
- 'ax_initialColNames': get_grid_col_names(request.user),
- 'ax_initialColModel': get_grid_col_models(request.user)
- }
- show_cols_variables = ('colModel', 'colNames', 'remap')
- for var in show_cols_variables:
- if var in request.session:
- js_vars[var] = request.session[var]
-
- js_vars['lemma'] = lemma_id
- js_vars['error'] = error
-
- return {'js_vars': js_vars}
-
-
-
def get_grid_col_names(user):
if user.is_authenticated():
names = ['Id', 'Hasło', 'Właściciel', 'Frazeolog', 'Semantyk', 'Słownik', 'Status']
@@ -497,55 +255,55 @@ def get_grid_col_names(user):
def get_grid_col_models(user):
if user.is_authenticated():
- col_models = [{
- 'name': 'id',
+ col_models = [{
+ 'name': 'id',
'index': 'id',
- 'search': False,
- 'hidden': True,
+ 'search': False,
+ 'hidden': True,
'sortable': True
},
{
- 'name': 'entry',
+ 'name': 'entry',
'index': 'entry',
- 'search': False,
+ 'search': False,
'hidden': False,
'sortable': True
},
{
'name': 'owner',
'index': 'owner',
- 'search': False,
- 'hidden': not user.groups.filter(Q(name=u'Leksykograf') |
+ 'search': False,
+ 'hidden': not user.groups.filter(Q(name=u'Leksykograf') |
Q(name=u'Superleksykograf')).exists(),
'sortable': True
},
{
'name': 'phraseologist',
'index': 'phraseologist',
- 'search': False,
- 'hidden': not user.groups.filter(Q(name=u'Frazeolog') |
+ 'search': False,
+ 'hidden': not user.groups.filter(Q(name=u'Frazeolog') |
Q(name=u'Superfrazeolog')).exists(),
'sortable': True
},
{
'name': 'semanticist',
'index': 'semanticist',
- 'search': False,
- 'hidden': not user.groups.filter(Q(name=u'Semantyk') |
+ 'search': False,
+ 'hidden': not user.groups.filter(Q(name=u'Semantyk') |
Q(name=u'Supersemantyk')).exists(),
'sortable': True
},
{
'name': 'vocabulary',
'index': 'vocabulary',
- 'search': False,
+ 'search': False,
'hidden': False,
'sortable': True
},
{
'name': 'status',
'index': 'status',
- 'search': False,
+ 'search': False,
'hidden': False,
'sortable': True
}
@@ -553,22 +311,93 @@ def get_grid_col_models(user):
else:
col_models = [
{
- 'name': 'entry',
+ 'name': 'entry',
'index': 'entry',
- 'search': False,
+ 'search': False,
'hidden': False,
'sortable': True
},
{
'name': 'status',
'index': 'status',
- 'search': False,
+ 'search': False,
'hidden': False,
'sortable': True
}
]
return col_models
+@render('entry.html')
+@ajax(method='get', encode_result=False)
+def entry(request, lemma, pos):
+ error = ''
+ lemma_id = -1
+ semantics_ready = False
+ try:
+ lemma_obj = Lemma.objects.get(entry_obj__name=lemma, entry_obj__pos__tag=pos,
+ old=False, status__in=get_ready_statuses())
+ lemma_id = lemma_obj.id
+ semantics_ready = lemma_obj.semantics_ready()
+ except Lemma.DoesNotExist:
+ error = 'Hasło nie istnieje w Walentym.'
+
+ nkjp_opinion_vals_tab = []
+ nkjp_opinion_objs = NKJP_Opinion.objects.order_by('priority')
+ for opinion in nkjp_opinion_objs:
+ nkjp_opinion_vals_tab.append(opinion.opinion)
+
+ nkjp_source_vals_tab = []
+ nkjp_source_objs = NKJP_Source.objects.order_by('priority')
+ for source in nkjp_source_objs:
+ nkjp_source_vals_tab.append(source.source)
+
+ js_vars = {
+ 'ajax_lemma_examples': reverse('get_lemma_examples'),
+ 'ajax_get_lemma_desc': reverse('get_lemma_desc'),
+ 'ajax_new_frames': reverse('get_new_frames'),
+ 'ajax_get_frame_filter_options': reverse('get_frame_filter_options'),
+ 'ajax_user_is_authenticated': reverse('user_is_authenticated'),
+ 'ajax_semantics': reverse('semantics.views.ajax_semantics'),
+ 'ajax_position_lookup': reverse('position_lookup'),
+ 'ajax_argument_lookup': reverse('argument_lookup'),
+ 'ajax_skladnica_example_propositions': reverse('skladnica_example_propositions'),
+ 'ajax_xcp_example_propositions': reverse('xcp_example_propositions'),
+ 'ajax_can_confirm_example': reverse('can_confirm_example'),
+ 'ajax_get_schemata_and_examples': reverse('get_schemata_and_examples'),
+ 'ajax_deselect_preview_tab': reverse('deselect_preview_tab'),
+
+ # modyfikacja przykladow nkjp
+ 'ajax_get_nkjp_dict_ids': reverse('get_nkjp_dict_ids'),
+
+ # powiazywanie hasel (nieczasownikowe)
+ 'ajax_are_new_preview_entries_related': reverse('are_new_preview_entries_related'),
+
+ # czasowniki podobne
+ 'ajax_preview_select': reverse('preview_select'),
+
+ # uprawnienia
+ 'ajax_user_has_perm': reverse('user_has_perm'),
+
+ # zmienne
+ 'ax_main_field': '',
+ 'ax_sort_order': '',
+ 'ax_nkjp_opinion_vals': nkjp_opinion_vals_tab,
+ 'ax_nkjp_source_vals': nkjp_source_vals_tab,
+
+ 'ax_initialColNames': [],
+ 'ax_initialColModel': [],
+
+ 'lemma': lemma_id,
+ 'error': error
+ }
+
+ to_return = {
+ 'js_vars': js_vars,
+ 'semantics_ready': semantics_ready
+ }
+
+ return to_return
+
@render('manage_vocabularies.html')
def manage_vocabulary(request):
to_return = {}
diff --git a/static/css/general.css b/static/css/general.css
index a1ea2d7..0889774 100644
--- a/static/css/general.css
+++ b/static/css/general.css
@@ -160,7 +160,13 @@ li {
}
-/* splittbar */
+/* splittbars */
+
+.vsplitbar {
+ width: 7px;
+ background: #bbc;
+}
+
.hsplitbar {
height: 7px;
background: #bbc;
diff --git a/static/js/entry-layout.js b/static/js/entry-layout.js
index a6d76dc..af47fb0 100644
--- a/static/js/entry-layout.js
+++ b/static/js/entry-layout.js
@@ -1,23 +1,3 @@
-var myLayout;
-var change = false;
-var notesNotSaved = false;
-var lemmaExNotSaved = false;
-var frames_operations = [];
-
-$(window).bind('beforeunload', function() {
- warnings = ""
- if(change)
- warnings = warnings + " - Nie zapisano zmian w schematach składniowych.\n";
- if(typeof semanticsChanged != "undefined" && semanticsChanged())
- warnings = warnings + " - Nie zapisano zmian w ramach semantycznych.\n";
- if(notesNotSaved)
- warnings = warnings + " - Nie zapisano notatki.\n";
- if(lemmaExNotSaved)
- warnings = warnings + " - Nie zapisano przykładu niedowiązangeo.\n";
- if(warnings)
- return "Uwaga:\n" + warnings
- });
-
$(function() {
$('#content').height($(window).height() - 20);
$(window).resize(function() {
@@ -35,13 +15,11 @@ $(function() {
}
});
-function ShowProgressAnimation()
-{
+function ShowProgressAnimation() {
$("#wait-dialog").dialog('open');
}
-function HideProgressAnimation()
-{
+function HideProgressAnimation() {
$("#wait-dialog").dialog('close');
}
@@ -49,8 +27,7 @@ function resize_splitters() {
$('#semantics-hsplit').trigger('resize');
}
-function createWaitDialog()
-{
+function createWaitDialog() {
$("#wait-dialog").dialog({ autoOpen: false,
modal : 'true',
closeOnEscape: 'false',
@@ -66,36 +43,9 @@ function createWaitDialog()
function refresh_column_headers() {}
function load_content(id) {
- $('#add-table-elem-dialog').dialog('close');
- if(lemma_id != id)
- $('#ready-note-dialog').dialog('close');
- initiateFrameFilters();
+ initiateFrameFilters();
ShowProgressAnimation();
- // czyszczenie wartosci
- window.elem_in_bucket = '';
- window.selected_notes_row_id = -1;
- window.selected_id = -1;
- window.prev_selected_id = -1;
- window.edited_id = -1;
- window.manipulated_id = -1;
- window.new_elem_id = -2;
- window.copy_elem_id = -1;
- window.activeNewFramePanel = 'frames_modif';
- window.selectedArgumentsIdNkjp = new Array();
- window.selectedFrameIdNkjp = -1;
- window.nkjp_examples = new Array();
- window.curr_example_id = -1;
- window.selected_example_id = -1;
- window.lemma_nkjp_examples = new Array();
- window.curr_lemma_example_id = -1;
- window.selected_lemma_example_id = -1;
- window.addedFrame = '';
-
- $('#new_frames').empty();
- window.change = false;
- window.notesNotSaved = false;
- window.lemmaExNotSaved = false;
$('#new_frames').load(ajax_new_frames, 'id='+id, function(data){
window.lemma_id = id;
@@ -104,16 +54,13 @@ function load_content(id) {
createSplitter('framesSplit','new-frame-tables', 'tabs');
- if(document.getElementById("lemma_example_show"))
- {
+ if(document.getElementById("lemma_example_show")) {
draw_nkjp_table(document.getElementById("lemma_example_show"), '', window.nkjp_lemma_examples, 'NkjpLemmaTableRow', 'nkjpLemma_')
$("tr.NkjpLemmaTableRow").click(function(){
selectLemmaNkjpTr(this.id)});
}
addPinnedExamplesDialog();
$('#lemma_desc').load(ajax_get_lemma_desc, 'id='+id);
- areNewPreviewEntriesRelated();
- refresh_example_propositions();
});
$('#semantics').load(ajax_semantics, 'id='+id);
}
@@ -140,7 +87,6 @@ function createSplitter(split_id, top_id, bottom_id) {
}
}
-
var hSplitterId = 'semantics-hsplit';
var topSplitId = 'semantics-hsplit-top';
var bottomSplitId = 'semantics-hsplit-bottom';
@@ -149,7 +95,6 @@ var bottomVSplitterId = 'semantics-vsplit-bottom';
var topLeftSplitId = 'frames';
var topRightSplitId = 'schemas';
var bottomLeftSplitId = 'control';
-var bottomRightSplitId = 'semantics-examples';
function createHSplitter() {
$('#'+hSplitterId).height($('#content').height() - 50);
@@ -222,30 +167,3 @@ function createVTopSplitter() {
});
}
}
-
-function createVBottomSplitter() {
- var w=$('#'+bottomVSplitterId).width();
- $('#'+bottomVSplitterId).height($('#content').height()/3);
- if ($.fn.splitter) {
- $('#'+bottomLeftSplitId).bind('resize', function(e) {
- $('#'+bottomVSplitterId).height($('#'+bottomSplitId).height());
- $('#'+bottomVSplitterId).children().each(function () {
- $(this).height($('#'+bottomSplitId).height()-7);
- });
-
- $('#'+bottomLeftSplitId).width($('#'+bottomLeftSplitId).width() - 7);
- $('#'+bottomRightSplitId).width($('#'+bottomRightSplitId).width() - 20);
- e.stopPropagation();
- });
- $('#'+bottomRightSplitId).bind('resize', function(e) {
- e.stopPropagation();
- });
- $('#'+bottomVSplitterId).splitter({
- type: "v",
- sizeLeft: w/3,
- minLeft: 200,
- resizeToWidth: true,
- outline: true
- });
- }
-}
diff --git a/templates/base.html b/templates/base.html
index fb0fcc6..6ce5d49 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -76,7 +76,7 @@
{% block nav-global %}{% endblock %}
{% if messages %}
<ul class="messagelist">{% for message in messages %}
- <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+ <li>{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
{% endfor %}</ul>
{% endif %}
</div>
diff --git a/templates/entry.html b/templates/entry.html
index ddb2322..4340020 100644
--- a/templates/entry.html
+++ b/templates/entry.html
@@ -20,13 +20,7 @@
<link rel="shortcut icon" href="{{STATIC_URL}}images/favicon.ico" type="image/png"/>
<link rel="stylesheet" href="{{ STATIC_URL }}css/lib/smoothness/jquery-ui-1.8.20.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="{{ STATIC_URL }}css/general.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/status_table.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/vocabulary_stats.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/user_stats.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="{{ STATIC_URL }}css/frame_table.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/arg_realization_table.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/arg_realization_viewtab.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/all_notes_table.css" type="text/css" media="screen" charset="utf-8" />
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -49,60 +43,46 @@
});
</script>
- <link rel="stylesheet" href="{{ STATIC_URL }}css/lib/ui.jqgrid.css" type="text/css" media="screen" charset="utf-8" />
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/lib/jquery.multiselect.css"/>
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jqgrid.css"/>
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/change_ctrl_table.css"/>
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/examples_table.css"/>
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/aspect_relations_table.css"/>
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/filter_frames_menu.css"/>
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/lemmas_filtering.css"/>
- <script type="text/javascript" src="{{ STATIC_URL }}js/lib/splitter.js"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/lib/jquery.multiselect.js"></script>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/change_ctrl_table.css"/>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/examples_table.css"/>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/filter_frames_menu.css"/>
+<script type="text/javascript" src="{{ STATIC_URL }}js/lib/splitter.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/lemma-view.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/entry-layout.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/schemata_filtering.js"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/semantics_coupling.js"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/lemma-view.js"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/entry-layout.js"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/lemmas_filtering.js"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/schemata_filtering.js"></script>
</head>
{% load i18n %}
<body>
-<!-- Container -->
-<!--div id="container"-->
-
- <!-- Header -->
<div id="header">
</div>
- <!-- END Header -->
- <!-- Content -->
-<div id="content">
- <div class="tabs">
- <ul>
- <li id="refresh_frames"><a href="#new_frames">{% trans "Składnia" %} [<span id="new-frames-count"></span>]</a></li>
- <li><a href="#semantics">{% trans "Semantyka" %} [<span id="semantic-frames-count"></span>]</a></li>
- <li><a href="#examples">{% trans "Przykłady" %} [<span id="lemma-examples-count"></span>]</a></li>
- <li id="lemma_desc" style="float:right;"></li>
- </ul>
- <div id="new_frames">
- </div>
- <div id="semantics">
- </div>
- <div id="examples">
- </div>
- </div>
+
+ <div id="content">
+ <div class="tabs">
+ <ul>
+ <li id="refresh_frames"><a href="#new_frames">{% trans "Składnia" %} [<span id="new-frames-count"></span>]</a></li>
+ {% if semantics_ready %}
+ <li><a href="#semantics">{% trans "Semantyka" %} [<span id="semantic-frames-count"></span>]</a></li>
+ {% endif %}
+ <li><a href="#examples">{% trans "Przykłady" %} [<span id="lemma-examples-count"></span>]</a></li>
+ <li id="lemma_desc" style="float:right;"></li>
+ </ul>
+
+ <div id="new_frames"></div>
+ {% if semantics_ready %}
+ <div id="semantics"></div>
+ {% endif %}
+ <div id="examples"></div>
+ </div>
</div>
- <!-- END Content -->
- {% block footer %}<div id="footer"></div>{% endblock %}
-<!--/div-->
-<!-- END Container -->
- <div id="wait-dialog">
- <div id="progress" class="ui-corner-all" >
- <h2 style="color:gray;font-weight:normal;">Proszę czekać....</h2>
- </div>
- </div>
+ <div id="footer"></div>
+ <div id="wait-dialog">
+ <div id="progress" class="ui-corner-all" >
+ <h2 style="color:gray;font-weight:normal;">Proszę czekać....</h2>
+ </div>
+ </div>
</body>
</html>
--
libgit2 0.22.2