Merge branch '15.0'

module/custom/lang/en.php

@@ -230,9 +230,9 @@ $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = 'Plan';
 $lang->custom->moduleName['execution']   = $lang->custom->execution;
 
-$lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?";
-$lang->custom->conceptQuestions['URAndSR']  = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
-
+$lang->custom->conceptQuestions['overview']   = "1. Which combination of management fits your company?";
+$lang->custom->conceptQuestions['URAndSR']    = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
+$lang->custom->conceptQuestions['storypoint'] = "3. Which of the following units is your company using for scale estimation?";
 
 $lang->custom->conceptOptions             = new stdclass;
 $lang->custom->conceptOptions->story      = array();

module/custom/view/browsestoryconcept.html.php

@@ -40,9 +40,9 @@
             <td class='text-center'><input type="radio" name='default' value='<?php echo $key;?>' <?php if($key == $config->custom->URSR) echo 'checked';?>></td>
             <?php endif;?>
             <?php if($this->config->URAndSR):?>
-            <td class='text-left'><?php echo $URSR['URName'];?></td>
+            <td class='text-left URBox'><?php echo $URSR['URName'];?></td>
             <?php endif;?>
-            <td class='text-left'><?php echo $URSR['SRName'];?></td>
+            <td class='text-left SRBox'><?php echo $URSR['SRName'];?></td>
             <td class='c-actions'>
               <?php $disabled = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
               <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' data-width=50% title={$lang->edit}");?>
@@ -60,5 +60,29 @@ $("input[name='default']").change(function()
     var checked = $(this).val();
     hiddenwin.location.href = createLink('custom', 'setDefaultConcept', 'key=' + checked);
 })
+<?php if(!$this->config->URAndSR):?>
+/* Duplicate removal. */
+var $SRBox = $('.table-form .SRBox');
+$SRBox.each(function(i)
+{
+    var $this = $(this);
+    var name = $this.html();
+    $SRBox.each(function(j)
+    {
+        if(j <= i) return;
+        if(name == $(this).html())
+        {
+            if($(this).closest('tr').find(':radio').prop('checked'))
+            {
+                $this.closest('tr').hide();
+            }
+            else
+            {
+                $(this).closest('tr').hide();
+            }
+        }
+    })
+})
+<?php endif;?>
 </script>
 <?php include '../../common/view/footer.html.php';?>