=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2014-12-08 19:51:34 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2015-01-03 10:32:31 +0000 @@ -121,7 +121,6 @@ levels=Levels import_process_done=Import successful import_process_failed=Import process failed - See log for details -importing_concepts=Importing concepts importing_constants=Importing constants importing_data_element_category_options=Importing data element category options importing_data_element_categories=Importing data element categories @@ -377,10 +376,6 @@ selected_categories=Selected Categories available_charts=Available Charts selected_charts=Selected Charts -concepts=Concepts -available_concepts=Available Concepts -selected_concepts=Selected Concepts - available_constants=Available Constants selected_constants=Selected Constants === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ar.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ar.properties 2014-12-17 10:03:49 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ar.properties 2015-01-03 10:32:31 +0000 @@ -23,7 +23,6 @@ levels=\u0627\u0644\u0645\u0633\u062a\u0648\u064a\u0627\u062a import_process_done=\u062a\u0645 \u0627\u0644\u0627\u0633\u062a\u064a\u0631\u0627\u062f \u0628\u0646\u062c\u0627\u062d import_process_failed=\u0641\u0634\u0644\u062a \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u0627\u0633\u062a\u064a\u0631\u0627\u062f- \u0627\u0646\u0638\u0631 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u062a\u0641\u0627\u0635\u064a\u0644 -importing_concepts=\u0645\u0641\u0627\u0647\u064a\u0645 \u0627\u0644\u0627\u0633\u062a\u064a\u0631\u0627\u062f importing_constants=\u0627\u0633\u062a\u064a\u0631\u0627\u062f \u0627\u0644\u062b\u0648\u0627\u0628\u062a importing_data_element_category_options=\u0627\u0633\u062a\u064a\u0631\u0627\u062f \u062e\u064a\u0627\u0631\u0627\u062a \u0641\u0626\u0629 \u0639\u0627\u0645\u0644 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a importing_data_element_categories=\u0627\u0633\u062a\u064a\u0631\u0627\u062f \u0641\u0626\u0627\u062a \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a @@ -282,9 +281,6 @@ available_charts=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064a\u0627\u0646\u064a\u0629 \u0627\u0644\u0645\u062a\u0627\u062d\u0629 selected_charts=\u0627\u0644\u0631\u0633\u0648\u0645 \u0627\u0644\u0628\u064a\u0627\u0646\u064a\u0629 \u0627\u0644\u0645\u062d\u062f\u062f\u0629 specify_file=\u0645\u0646 \u0641\u0636\u0644\u0643 \u062d\u062f\u062f \u0645\u0644\u0641\u0627 -concepts=\u0645\u0635\u0637\u0644\u062d\u0627\u062a -available_concepts=\u0627\u0644\u0645\u0635\u0637\u0644\u062d\u0627\u062a \u0627\u0644\u0645\u062a\u0648\u0641\u0631\u0629 -selected_concepts=\u0627\u0644\u0645\u0635\u0637\u0644\u062d\u0627\u062a \u0627\u0644\u0645\u062d\u062f\u062f\u0629 available_constants=\u0627\u0644\u062b\u0648\u0627\u0628\u062a \u0627\u0644\u0645\u062a\u0648\u0641\u0631\u0629 available_dataElementGroups=\u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0645\u062a\u0648\u0641\u0631 data_sets=\u0645\u0646\u0638\u0648\u0645\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es.properties 2014-11-05 09:10:58 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es.properties 2015-01-03 10:32:31 +0000 @@ -23,7 +23,6 @@ levels=Niveles import_process_done=Importado satisfactoriamente import_process_failed=Proceso de importado err\u00f3neo - Vea el log para los detalles -importing_concepts=Conceptos importados importing_constants=Constantes importadas importing_data_element_category_options=Importando opciones de categor\u00eda de elementos de datos importing_data_element_categories=Importando categor\u00edas de elementos de datos === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr.properties 2014-07-05 17:36:08 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr.properties 2015-01-03 10:32:31 +0000 @@ -23,7 +23,6 @@ levels=Niveaux import_process_done=Importation avec succ\u00e8s import_process_failed=Ech\u00e8c du processus d'importation - voir le log pour les d\u00e9tails -importing_concepts=Importation des concepts importing_constants=Importation des constantes importing_data_element_category_options=Importation des options de cat\u00e9gories d'\u00e9l\u00e9ment de donn\u00e9e importing_data_element_categories=Importation des cat\u00e9gories d'\u00e9lements de donn\u00e9es @@ -270,8 +269,6 @@ selected_categories=cat\u00e9gories s\u00e9lectionn\u00e9s available_charts=Graphiques disponibles selected_charts=Graphiques s\u00e9lectionn\u00e9s -available_concepts=Concepts disponibles -selected_concepts=Concepts s\u00e9lectionn\u00e9s available_constants=Constantes disponibles selected_constants=Constantes s\u00e9lectionn\u00e9es available_dataDictionaries=Dictionnaires de Donn\u00e9es disponibles @@ -428,6 +425,5 @@ dxf2=DXF2 xml_metadata_import=XML Meta-Data Import csv_metadata_import=CSV Meta-Data Import -concepts=Concepts documents=Documents inclusion=Inclusion === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_id.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_id.properties 2013-10-01 13:16:44 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_id.properties 2015-01-03 10:32:31 +0000 @@ -112,7 +112,6 @@ levels=Level import_process_done=Import sukses dilakukan import_process_failed=Proses import gagal dilakukan - Lihat log untuk melihat detail -importing_concepts=Mengimport konsep importing_constants=Mengimport konstanta importing_data_element_category_options=Mengimport pilihan kategori elemen data importing_data_element_categories=Mengimport kategori elemen data === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_lo.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_lo.properties 2014-10-17 08:19:44 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_lo.properties 2015-01-03 10:32:31 +0000 @@ -49,7 +49,6 @@ dhis14_file_configuration=DHIS 1.4 File Configuration data_file=Datafile import_process_done=Import successful -importing_concepts=Importing concepts importing_constants=Importing constants importing_data_element_category_combos=Importing data element category combos importing_data_element_category_option_combos=Importing data element category option combos @@ -176,8 +175,6 @@ available_attribute_types=Available Attribute Types categories=Categories available_categories=Available Categories -concepts=Concepts -selected_concepts=Selected Concepts available_dataElementGroupSets=Available Data Element Group Sets selected_dataElementGroupSets=Selected Data Element Group Sets available_dataElementGroups=Available Data Element Groups @@ -373,7 +370,6 @@ selected_attribute_types=Selected Attribute Types selected_categories=Selected Categories available_charts=Available Charts -available_concepts=Available Concepts available_constants=Available Constants selected_constants=Selected Constants available_dataDictionaries=Available Data Dictionaries === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt.properties 2013-12-01 20:40:15 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt.properties 2015-01-03 10:32:31 +0000 @@ -1,6 +1,5 @@ #Wed Oct 30 11:51:48 GMT 2013 DHIS14_xml_import=Importa\u00E7\u00E3o SISD 1.4 XML -importing_concepts=Importando conceitos indicator_group_sets=Conjuntos de grupo de indicador importing_olap_urls=Importando URLs OLAP periods=Per\u00EDodos === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt_BR.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt_BR.properties 2013-10-01 13:16:44 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt_BR.properties 2015-01-03 10:32:31 +0000 @@ -1,7 +1,6 @@ #Resource generated by I18n Resource Editor #Wed Apr 24 11:36:26 CAT 2013 DHIS14_xml_import=Importa\u00e7\u00e3o SISD 1.4 XML -importing_concepts=Importando conceitos indicator_group_sets=Conjuntos de grupo de indicador importing_olap_urls=Importando URLs OLAP periods=Per\u00edodos === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ru.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ru.properties 2013-10-01 13:16:44 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ru.properties 2015-01-03 10:32:31 +0000 @@ -112,7 +112,6 @@ levels = \u0423\u0440\u043e\u0432\u043d\u0438 import_process_done = \u0423\u0441\u043f\u0435\u0448\u043d\u043e\u0435 \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 import_process_failed = \u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043d\u0435 \u0443\u0434\u0430\u043b\u0441\u044f - \u0414\u0435\u0442\u0430\u043b\u0438 \u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u0432 \u0436\u0443\u0440\u043d\u0430\u043b\u0435 -importing_concepts = \u041a\u043e\u043d\u0446\u0435\u043f\u0446\u0438\u0438 \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f importing_constants = \u041f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u044b\u0435 \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f importing_data_element_category_options = \u041e\u043f\u0446\u0438\u0438 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f importing_data_element_categories = \u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_tg.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_tg.properties 2013-10-01 13:16:44 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_tg.properties 2015-01-03 10:32:31 +0000 @@ -112,7 +112,6 @@ levels = \u0421\u0430\u0442\u04b3\u04b3\u043e import_process_done = \u0421\u043e\u0434\u0438\u0440\u043e\u0442\u0438 \u0431\u043e\u043c\u0443\u0432\u0430\u0444\u0444\u0430\u049b\u0438\u044f\u0442 import_process_failed = \u0420\u0430\u0432\u0430\u043d\u0434\u0438 \u0441\u043e\u0434\u0438\u0440\u043e\u0442 \u0438\u04b7\u0440\u043e \u043d\u0430\u0448\u0443\u0434 - \u0422\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u0440\u043e \u0434\u0430\u0440 \u043a\u0438\u0442\u043e\u0431\u0438 \u049b\u0430\u0439\u0434 \u0431\u0438\u043d\u0435\u0434 -importing_concepts = \u0412\u043e\u0440\u0438\u0434\u043e\u0442\u0438 \u043a\u043e\u043d\u0441\u0435\u043f\u0441\u0438\u044f\u04b3\u043e importing_constants = \u0412\u043e\u0440\u0438\u0434\u043e\u0442\u0438 \u0434\u043e\u0438\u043c\u0438\u04b3\u043e importing_data_element_category_options = \u0412\u043e\u0440\u0438\u0434\u043e\u0442\u0438 \u0438\u043c\u043a\u043e\u043d\u043e\u0442\u0438 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u04b3\u043e\u0438 \u0443\u043d\u0441\u0443\u0440\u04b3\u043e\u0438 \u0438\u0442\u0442\u0438\u043b\u043e\u043e\u0442 importing_data_element_categories = \u0412\u043e\u0440\u0438\u0434\u043e\u0442\u0438 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u04b3\u043e\u0438 \u0443\u043d\u0441\u0443\u0440\u04b3\u043e\u0438 \u0438\u0442\u0442\u0438\u043b\u043e\u043e\u0442 === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi.properties 2013-07-02 15:58:13 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi.properties 2015-01-03 10:32:31 +0000 @@ -213,7 +213,6 @@ data_elements=C\u00e1c d\u1eef li\u1ec7u import_process_done=T\u00edch h\u1ee3p d\u1eef li\u1ec7u v\u00e0o th\u00e0nh c\u00f4ng import_process_failed=Vi\u1ec7c t\u00edch h\u1ee3p d\u1eef li\u1ec7u v\u00e0o kh\u00f4ng th\u00e0nh c\u00f4ng - Xem nh\u1eadt k\u00fd \u0111\u1ec3 bi\u1ebft th\u00eam chi ti\u1ebft -importing_concepts=\u0110ang t\u00edch h\u1ee3p c\u00e1c kh\u00e1i ni\u1ec7m importing_constants=\u0110ang t\u00edch h\u1ee3p c\u00e1c h\u1eb1ng s\u1ed1 importing_data_element_category_options=\u0110ang t\u00edch h\u1ee3p c\u00e1c danh m\u1ee5c ph\u00e2n lo\u1ea1i d\u1eef li\u1ec7u importing_data_element_categories=\u0110ang t\u00edch h\u1ee3p c\u00e1c ph\u00e2n lo\u1ea1i d\u1eef li\u1ec7u === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_zh.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_zh.properties 2013-10-01 13:16:44 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_zh.properties 2015-01-03 10:32:31 +0000 @@ -1,7 +1,6 @@ #Resource generated by I18n Resource Editor #Tue Jul 31 01:31:50 CST 2012 DHIS14_xml_import=\u7248\u672c1.4\u7684XML\u6587\u4ef6\u5bfc\u5165 -importing_concepts=\u5bfc\u5165\u6982\u5ff5 indicator_group_sets=\u6307\u6807\u7ec4\u96c6 importing_olap_urls=\u5bfc\u5165\u8054\u673a\u5206\u6790\u5904\u7406\u7684URLs periods=\u5468\u671f @@ -58,7 +57,6 @@ yes_empty_database=\u786e\u5b9a\u7a7a\u6570\u636e\u5e93 discard_all=\u653e\u5f03\u5168\u90e8 less_than_or_equal_to=\u5c0f\u4e8e\u6216\u7b49\u4e8e -data_element_concepts=\u6570\u636e\u5143\u6982\u5ff5 no_filename=" \u6ca1\u6709\u9009\u5b9a. \u8bf7\u9009\u62e9\u4e00\u4e2a\u6587\u4ef6\=\u7136\u540e\u518d\u8bd5\u4e00\u6b21. " match_to_existing=\u5339\u914d\u5230\u5b58\u5728\u7684 up=\u5411\u4e0a === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm 2012-06-06 11:36:25 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm 2015-01-03 10:32:31 +0000 @@ -44,10 +44,6 @@ - - - - === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm 2014-05-27 11:52:00 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm 2015-01-03 10:32:31 +0000 @@ -11,15 +11,9 @@ var i18n_available_charts = '$encoder.jsEscape( $i18n.getString( "available_charts" ), "'" )'; var i18n_selected_charts = '$encoder.jsEscape( $i18n.getString( "selected_charts" ), "'" )'; - var i18n_available_concepts = '$encoder.jsEscape( $i18n.getString( "available_concepts" ), "'" )'; - var i18n_selected_concepts = '$encoder.jsEscape( $i18n.getString( "selected_concepts" ), "'" )'; - var i18n_available_constants = '$encoder.jsEscape( $i18n.getString( "available_constants" ), "'" )'; var i18n_selected_constants = '$encoder.jsEscape( $i18n.getString( "selected_constants" ), "'" )'; - var i18n_available_dataDictionaries = '$encoder.jsEscape( $i18n.getString( "available_dataDictionaries" ), "'" )'; - var i18n_selected_dataDictionaries = '$encoder.jsEscape( $i18n.getString( "selected_dataDictionaries" ), "'" )'; - var i18n_available_dataElementGroupSets = '$encoder.jsEscape( $i18n.getString( "available_dataElementGroupSets" ), "'" )'; var i18n_selected_dataElementGroupSets = '$encoder.jsEscape( $i18n.getString( "selected_dataElementGroupSets" ), "'" )'; @@ -160,21 +154,11 @@
- -
- -
-
- -
- -
-
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedMetaDataImport.js' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedMetaDataImport.js 2014-05-27 11:51:17 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedMetaDataImport.js 2015-01-03 10:32:31 +0000 @@ -1,5 +1,5 @@ // Global Variables -var metaDataArray = [ "AttributesTypes", "Dimensions", "Charts", "Concepts", "Constants", "DataDictionaries", "DataElementGroupSets", +var metaDataArray = [ "AttributesTypes", "Dimensions", "Charts", "Constants", "DataElementGroupSets", "DataElementGroups", "DataElements", "DataSets", "Documents", "IndicatorGroupSets", "IndicatorGroups", "Indicators", "IndicatorTypes", "MapLegendSets", "Maps", "OptionSets", "OrganisationUnitGroupSets", "OrganisationUnitGroups", "OrganisationUnitLevels", "OrganisationUnits", "ReportTables", "Reports", "SqlViews", "UserGroups", "UserRoles", === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js 2014-05-27 11:51:17 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js 2015-01-03 10:32:31 +0000 @@ -1,5 +1,5 @@ // Global Variables -var metaDataArray = [ "Attributes", "Dimensions", "Charts", "Concepts", "Constants", "DataDictionaries", "DataElementGroupSets", +var metaDataArray = [ "Attributes", "Dimensions", "Charts", "Constants", "DataElementGroupSets", "DataElementGroups", "DataElements", "DataSets", "Documents", "IndicatorGroupSets", "IndicatorGroups", "Indicators", "IndicatorTypes", "MapLegendSets", "Maps", "OptionSets", "OrganisationUnitGroupSets", "OrganisationUnitGroups", "OrganisationUnitLevels", "OrganisationUnits", "ReportTables", "Reports", "SqlViews", "UserGroups", "UserRoles", === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js 2014-05-27 11:39:46 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js 2015-01-03 10:32:31 +0000 @@ -21,12 +21,8 @@ return i18n_available_categories; case "Charts": return i18n_available_charts; - case "Concepts": - return i18n_available_concepts; case "Constants": return i18n_available_constants; - case "DataDictionaries": - return i18n_available_dataDictionaries; case "DataElementGroupSets": return i18n_available_dataElementGroupSets; case "DataElementGroups": @@ -91,12 +87,8 @@ return i18n_selected_categories; case "Charts": return i18n_selected_charts; - case "Concepts": - return i18n_selected_concepts; case "Constants": return i18n_selected_constants; - case "DataDictionaries": - return i18n_selected_dataDictionaries; case "DataElementGroupSets": return i18n_selected_dataElementGroupSets; case "DataElementGroups": === removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 2014-02-13 09:51:36 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 1970-01-01 00:00:00 +0000 @@ -1,33 +0,0 @@ - - -

$i18n.getString( "create_new_concept" )

- -
- - - - - - - - - - - - - -
$i18n.getString( "details" )
-
- -
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2014-02-13 09:51:36 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 1970-01-01 00:00:00 +0000 @@ -1,73 +0,0 @@ - - -

$i18n.getString( "concept_management" ) #openHelp( "concept" )

- -
- -
- - - - - - - -
- - - - - -
#filterDiv( "concept" )
- - - - - - - - #foreach( $concept in $concepts ) - #if( $concept.id != $defaultConcept.id ) - - - - #end - #end - -
$i18n.getString( "name" )
$encoder.htmlEncode( $!concept.displayName )
-

- #parse( "/dhis-web-commons/paging/paging.vm" ) - 		-
-
- - $i18n.getString( 'hide_details' ) - -
-


-
- -
-
- - $i18n.getString( 'hide_warning' ) - -
-

-
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 2014-02-13 09:51:36 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 1970-01-01 00:00:00 +0000 @@ -1,37 +0,0 @@ - - -

$i18n.getString( "edit_concept" )

- -
- -
- -
- - - - - - - - - - - - - -
$i18n.getString( "details" )
-
- -