Pflichtenhefte: Verwendung von jQuery-UI-Dialogen anstelle von jqModal

diff --git a/SL/Controller/RequirementSpecVersion.pm b/SL/Controller/RequirementSpecVersion.pm
index 1a4557e9b54a7f182e8dab4d798356807d5ca39d..9258698e8d1b2ad15fc0b4d4ebcf8876d32513ea 100644 (file)
--- a/SL/Controller/RequirementSpecVersion.pm
+++ b/SL/Controller/RequirementSpecVersion.pm
@@ -60,7 +60,7 @@ sub action_new {
     $self->version->description(@lines ? join("\n", @lines) : t8('No changes since previous version.'));
   }
 
     $self->version->description(@lines ? join("\n", @lines) : t8('No changes since previous version.'));
   }
 

-  $self->render('requirement_spec_version/new', { layout => 0 }, title => t8('Create a new version'));
+  $self->render('requirement_spec_version/new', { layout => 0 });

 }
 
 sub action_create {
 }
 
 sub action_create {


@@ -85,7 +85,7 @@ sub action_create {
   $self->js
     ->html('#requirement_spec_version', $version_info_html)
     ->html('#versioned_copies_list',    $version_list_html)
   $self->js
     ->html('#requirement_spec_version', $version_info_html)
     ->html('#versioned_copies_list',    $version_list_html)

-    ->jqmClose('.jqmWindow')
+    ->dialog->close('#jqueryui_popup_dialog')

     ->render($self);
 }
 
     ->render($self);
 }
 

diff --git a/js/locale/de.js b/js/locale/de.js
index 31831879bb5121ff9c08c799547d20d9177a523f..da287e6e05ebbe2977078afc9db8db226c0548fb 100644 (file)
--- a/js/locale/de.js
+++ b/js/locale/de.js
@@ -12,6 +12,7 @@ namespace("kivi").setupLocale({
 "Copy template":"Vorlage kopieren",
 "Create":"Anlegen",
 "Create PDF":"PDF erzeugen",
 "Copy template":"Vorlage kopieren",
 "Create":"Anlegen",
 "Create PDF":"PDF erzeugen",

+"Create a new version":"Eine neue Version anlegen",

 "Create new quotation/order":"Neues Angebot/neuen Auftrag anlegen",
 "Create new qutoation/order":"Neues Angebot/neuen Auftrag anlegen",
 "Create new version":"Neue Version anlegen",
 "Create new quotation/order":"Neues Angebot/neuen Auftrag anlegen",
 "Create new qutoation/order":"Neues Angebot/neuen Auftrag anlegen",
 "Create new version":"Neue Version anlegen",


@@ -41,6 +42,7 @@ namespace("kivi").setupLocale({
 "Revert to version":"Auf Version zurücksetzen",
 "Save":"Speichern",
 "Section/Function block actions":"Abschnitts-/Funktionsblockaktionen",
 "Revert to version":"Auf Version zurücksetzen",
 "Save":"Speichern",
 "Section/Function block actions":"Abschnitts-/Funktionsblockaktionen",

+"Select template to paste":"Einzufügende Vorlage auswählen",

 "Text block actions":"Textblockaktionen",
 "The description is missing.":"Die Beschreibung fehlt.",
 "The name is missing.":"Der Name fehlt.",
 "Text block actions":"Textblockaktionen",
 "The description is missing.":"Die Beschreibung fehlt.",
 "The name is missing.":"Der Name fehlt.",

diff --git a/js/requirement_spec.js b/js/requirement_spec.js
index 0946655139d0eb2a734b65a13806afd88306bc67..e059e8400f0a60a1bc7b2af3739ca2ee7bdba2cc 100644 (file)
--- a/js/requirement_spec.js
+++ b/js/requirement_spec.js
@@ -281,11 +281,11 @@ ns.item_popup_menu_hidden = function(opt) {
 // -------------------------------------------------------------------------
 
 ns.paste_template = function(key, opt, other_data) {
 // -------------------------------------------------------------------------
 
 ns.paste_template = function(key, opt, other_data) {

-  open_jqm_window({ url: 'controller.pl?action=RequirementSpec/select_template_to_paste' });
+  kivi.popup_dialog({ url: 'controller.pl?action=RequirementSpec/select_template_to_paste', dialog: { title: kivi.t8("Select template to paste") } });

 };
 
 ns.paste_selected_template = function(template_id) {
 };
 
 ns.paste_selected_template = function(template_id) {

-  $('#jqm_popup_dialog').jqmClose();
+  $('#jqueryui_popup_dialog').dialog("close");

 
   var data = {
     action:               "RequirementSpec/paste_template",
 
   var data = {
     action:               "RequirementSpec/paste_template",


@@ -459,10 +459,10 @@ ns.disable_versioned_copy_item_commands = function(key, opt) {
 };
 
 ns.create_version = function() {
 };
 
 ns.create_version = function() {

-  open_jqm_window({ url:  'controller.pl',
-                    data: { action:              'RequirementSpecVersion/new',
-                            requirement_spec_id: $('#requirement_spec_id').val() },
-                    id:   'new_requirement_spec_version_window' });
+  kivi.popup_dialog({ url:    'controller.pl',
+                      data:   { action:              'RequirementSpecVersion/new',
+                                requirement_spec_id: $('#requirement_spec_id').val() },
+                      dialog: { title: kivi.t8('Create a new version') }});

   return true;
 };
 
   return true;
 };
 

diff --git a/templates/webpages/requirement_spec/select_template_to_paste.html b/templates/webpages/requirement_spec/select_template_to_paste.html
index f73441b4ff01faf35ba5d9356c901f14d0ac4b4d..02d5a36492f98b73d94eeaa11e86c3cc6ae469d0 100644 (file)
--- a/templates/webpages/requirement_spec/select_template_to_paste.html
+++ b/templates/webpages/requirement_spec/select_template_to_paste.html
@@ -12,13 +12,9 @@
  [%- END %]
 [%- END %]
 
  [%- END %]
 [%- END %]
 

-<h1>[%- LxERP.t8("Select template to paste") %]</h1>
-

 [%- IF !TEMPLATES.size %]
 <p>[%- LxERP.t8("No requirement spec templates have been created yet.") %]</p>
 
 [%- IF !TEMPLATES.size %]
 <p>[%- LxERP.t8("No requirement spec templates have been created yet.") %]</p>
 

-<p><a href="#" onclick="$('#jqm_popup_dialog').jqmClose();">[%- LxERP.t8("Abort") %]</a></p>
-

 [%- ELSE %]
 
 <table>
 [%- ELSE %]
 
 <table>


@@ -68,5 +64,6 @@
 [%- END %]
 </table>
 
 [%- END %]
 </table>
 

-<p><a href="#" onclick="$('#jqm_popup_dialog').jqmClose();">[%- LxERP.t8("Abort") %]</a></p>

 [%- END %]
 [%- END %]

+
+<p><a href="#" onclick="$('#jqueryui_popup_dialog').dialog('close');">[%- LxERP.t8("Abort") %]</a></p>

diff --git a/templates/webpages/requirement_spec_version/_form.html b/templates/webpages/requirement_spec_version/_form.html
index a100c33835a410cfaff16873d82d42f6657728b4..6d312a9424e52d6fa2c64e2bf3cf5f02f89ede5a 100644 (file)
--- a/templates/webpages/requirement_spec_version/_form.html
+++ b/templates/webpages/requirement_spec_version/_form.html
@@ -30,7 +30,7 @@
   <a href="[% SELF.url_for(action='list') %]">[%- LxERP.t8("Cancel") %]</a>
 [%- ELSE %]
   [% L.ajax_submit_tag("controller.pl?action=RequirementSpecVersion/create",  "#" _ id_prefix, LxERP.t8("Save")) %]
   <a href="[% SELF.url_for(action='list') %]">[%- LxERP.t8("Cancel") %]</a>
 [%- ELSE %]
   [% L.ajax_submit_tag("controller.pl?action=RequirementSpecVersion/create",  "#" _ id_prefix, LxERP.t8("Save")) %]

-  <a href="#" onclick="$('.jqmWindow').jqmClose();">[% LxERP.t8("Cancel") %]</a>
+  <a href="#" onclick="$('#jqueryui_popup_dialog').dialog('close');">[% LxERP.t8("Cancel") %]</a>

 [%- END %]
  </p>
 </form>
 [%- END %]
  </p>
 </form>

diff --git a/templates/webpages/requirement_spec_version/new.html b/templates/webpages/requirement_spec_version/new.html
index ebcca876c20f6cd442e96572b3865bb65b044b26..ff53b7a7f3d61da267768e5bd2555bb9a11563c0 100644 (file)
--- a/templates/webpages/requirement_spec_version/new.html
+++ b/templates/webpages/requirement_spec_version/new.html
@@ -1,5 +1,3 @@
-<h1>[% title %]</h1>
-

 [%- INCLUDE 'common/flash.html' %]
 
 [%- INCLUDE 'requirement_spec_version/_form.html' %]
 [%- INCLUDE 'common/flash.html' %]
 
 [%- INCLUDE 'requirement_spec_version/_form.html' %]