* Use modalHeader wg.

module/story/lang/de.php

@@ -24,6 +24,7 @@ $lang->story->changed            = 'Geändert';
 $lang->story->assignTo           = 'Assign';
 $lang->story->review             = 'Prüfen';
 $lang->story->submitReview       = "Submit Review";
+$lang->story->submitreview       = $lang->story->submitReview;
 $lang->story->recall             = 'Revoke';
 $lang->story->recallChange       = 'Undo Changes';
 $lang->story->recallAction       = 'Undo';

module/story/lang/en.php

@@ -24,6 +24,7 @@ $lang->story->changed            = 'Change';
 $lang->story->assignTo           = 'Assign';
 $lang->story->review             = 'Review';
 $lang->story->submitReview       = "Submit Review";
+$lang->story->submitreview       = $lang->story->submitReview;
 $lang->story->recall             = 'Revoke';
 $lang->story->recallChange       = 'Undo Changes';
 $lang->story->recallAction       = 'Undo';

module/story/lang/fr.php

@@ -24,6 +24,7 @@ $lang->story->changed            = 'Changée';
 $lang->story->assignTo           = 'Affecter';
 $lang->story->review             = 'Valider';
 $lang->story->submitReview       = "Submit Review";
+$lang->story->submitreview       = $lang->story->submitReview;
 $lang->story->recall             = 'Revoke';
 $lang->story->recallChange       = 'Undo Changes';
 $lang->story->recallAction       = 'Undo';

module/story/lang/zh-cn.php

@@ -24,6 +24,7 @@ $lang->story->changed            = "{$lang->SRCommon}变更";
 $lang->story->assignTo           = '指派';
 $lang->story->review             = '评审';
 $lang->story->submitReview       = "提交评审";
+$lang->story->submitreview       = $lang->story->submitReview;
 $lang->story->recall             = '撤销评审';
 $lang->story->recallChange       = '撤销变更';
 $lang->story->recallAction       = '撤销';

module/story/tao.php

@@ -1485,7 +1485,7 @@ class storyTao extends storyModel
         $canRecall = common::hasPriv('story', 'recall') && $this->isClickable($story, 'recall');
         $title     = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
         if(!$canRecall) $title = $this->lang->story->recallTip['actived'];
-        $actRecall = array('name' => $story->status == 'changing' ? 'recalledchange' : 'recall', 'data-toggle' => $canRecall ? 'modal' : null, 'url' => $canRecall ? $link : null, 'hint' => $title, 'disabled' => !$canRecall);
+        $actRecall = array('name' => $story->status == 'changing' ? 'recalledchange' : 'recall', 'data-toggle' => $canRecall ? 'modal' : null, 'url' => $canRecall ? $recallLink : null, 'hint' => $title, 'disabled' => !$canRecall);
 
         /* Change the render order. */
         if(!empty($actSubmitreview))
@@ -1504,7 +1504,7 @@ class storyTao extends storyModel
             $actions[] = array('name' => 'dropdown', 'type' => 'dropdown', 'items' => array($actRecall));
         }
 
-        $actions[] = array('name' => 'close', 'url' => $canClose ? $closeLink : null, 'disabled' => !$canClose);
+        $actions[] = array('name' => 'close', 'url' => $canClose ? $closeLink : null, 'data-toggle' => 'modal', 'disabled' => !$canClose);
 
         /* Render divider line. */
         $actions[] = array('name' => 'divider', 'class'=>'nav-divider', 'type' => 'dropdown', 'icon' => '', 'caret' => false);

module/story/ui/change.html.php

@@ -21,25 +21,6 @@ jsVar('storyType', $story->type);
 jsVar('rawModule', $this->app->rawModule);
 jsVar('page', $this->app->rawMethod);
 
-$formTitle = div
-(
-    span
-    (
-        setClass('form-label'),
-        $lang->story->changed
-    ),
-    div
-    (
-        setClass('form-group form-title'),
-        $story->title,
-        span
-        (
-            setClass('label text-gray size-sm'),
-            $story->id
-        )
-    ),
-);
-
 $formItems = array();
 $formItems['reviewer'] = formGroup
 (
@@ -157,9 +138,10 @@ $formActions = formRow
     setClass('form-actions form-group no-label'),
     btn(setClass('primary'), set::id('saveButton'), $lang->save),
     btn(setClass('secondary'), set::id('saveDraftButton'), $lang->story->doNotSubmit),
-    btn(set::url('javascript:history.go(-1)'), $lang->goback),
+    backBtn($lang->goback),
 );
 
+modalHeader();
 formPanel
 (
     set::id('dataform'),
@@ -169,6 +151,7 @@ formPanel
     $formItems,
     $formActions,
     h::hr(),
-    history()
+    history(),
 );
+
 render();

module/story/ui/close.html.php

@@ -12,25 +12,11 @@ declare(strict_types=1);
 
 namespace zin;
 
+modalHeader();
 formPanel
 (
-    set::title($lang->story->close . $lang->story->story),
-    set::actions(array('submit')),
     set::submitBtnText($lang->story->closeAction),
-    set::headingClass('status-heading'),
-    set::titleClass('form-label .form-grid'),
     on::change('#closedReasonBox', 'setStory'),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::entityID($story->id),
-            set::text($story->title),
-            set::level(1),
-            set::reverse(true),
-        )
-    ),
     formGroup
     (
         set::id('closedReasonBox'),
@@ -62,7 +48,6 @@ formPanel
     ),
 );
 
-h::hr(set::class('mt-6'));
 history();
 
 render();

module/story/ui/review.html.php

@@ -17,25 +17,6 @@ jsVar('rawModule', $this->app->rawModule);
 jsVar('isMultiple', count($reviewers) > 1);
 jsVar('isLastOne', $isLastOne);
 
-$formTitle = div
-(
-    span
-    (
-        setClass('form-label'),
-        $lang->story->reviewAction
-    ),
-    div
-    (
-        setClass('form-group form-title'),
-        $story->title,
-        span
-        (
-            setClass('label text-gray size-sm'),
-            $story->id
-        )
-    ),
-);
-
 $formItems = array();
 foreach($fields as $field => $attr)
 {
@@ -69,15 +50,11 @@ $formItems['estimate']->add(set::id('estimateBox'))->add(set::hidden(true));
 $formItems['childStories']->add(set::id('childStoriesBox'))->add(set::hidden(true));
 $formItems['status']->add(set::hidden(true));
 
+modalHeader();
 panel
 (
     setClass('panel-form mx-auto'),
-    set::title(''),
-    form
-    (
-        $formTitle,
-        $formItems,
-    ),
+    form($formItems),
     h::hr(set::class('mt-6 mb-6')),
     history()
 );

module/story/ui/submitreview.html.php

@@ -26,23 +26,9 @@ if(!$this->story->checkForceReview())
     );
 }
 
+modalHeader();
 formPanel
 (
-    set::title($lang->story->submitReview),
-    set::actions(array('submit')),
-    set::headingClass('status-heading'),
-    set::titleClass('form-label .form-grid'),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::entityID($story->id),
-            set::text($story->title),
-            set::level(1),
-            set::reverse(true),
-        )
-    ),
     formGroup
     (
         set::label($lang->story->reviewedBy),
@@ -63,7 +49,6 @@ formPanel
     ),
 );
 
-h::hr(set::class('mt-6'));
 history();
 
 render();