diff --git a/module/common/view/pastetext.html.php b/module/common/view/pastetext.html.php
index 806f4af149..70bf23ecb4 100644
--- a/module/common/view/pastetext.html.php
+++ b/module/common/view/pastetext.html.php
@@ -28,6 +28,7 @@ $(function()
var lastIndex = parseInt($formTbody.find('tr:last > td:first').text());
var $newRow = $(rowTpl.replace(/%s/g, lastIndex + 1));
$newRow.find('.chosen').chosen();
+ $newRow.find('.iframe').modalTrigger({iframe:true});;
$newRow.find('[data-provide="colorpicker-later"]').colorPicker();
$newRow.datepickerAll();
$formTbody.append($newRow);
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 54349d7f2a..0282842b8f 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -88,10 +88,12 @@
{
$parsedUrl = parse_url($url);
$urlDomain = $parsedUrl['scheme'] . '://' . $parsedUrl['host'];
- $response = common::http($url);
+
+ $title = '';
+ $response = common::http($url);
preg_match_all('/(.*)<\/title>/Ui', $response, $out);
- $title = '';
if(isset($out[1][0])) $title = $out[1][0];
+
echo "<div id='urlCard'>";
echo "<div class='url-icon'><img src='{$urlDomain}/favicon.ico' width='45' height='45' /></div>";
echo "<div class='url-content'>";
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 77d1fca3b4..1fb0ade2cb 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -24,10 +24,10 @@ $lang->group->manageMember = 'Member';
$lang->group->confirmDelete = 'Do you want to delete this User Group?';
$lang->group->successSaved = 'Saved.';
$lang->group->errorNotSaved = 'Failed. Please select actions and groups.';
-$lang->group->viewList = 'Views can be accessed.';
-$lang->group->productList = 'Products can be accessed.';
-$lang->group->projectList = 'Projects can be accessed.';
-$lang->group->noticeVisit = 'Empty means you have no access.';
+$lang->group->viewList = 'View';
+$lang->group->productList = 'Product';
+$lang->group->projectList = 'Project';
+$lang->group->noticeVisit = 'Empty means no access.';
$lang->group->id = 'ID';
$lang->group->name = 'Name';
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index f4c4a0202d..303a6e7adc 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -74,7 +74,7 @@ function copyStoryTitle(num)
function setStoryRelated(num)
{
var storyID = $('#story' + num).val();
- if(storyID)
+ if(storyID && storyID != 'ditto')
{
var link = createLink('story', 'ajaxGetInfo', 'storyID=' + storyID);
$.getJSON(link, function(storyInfo)
@@ -86,6 +86,18 @@ function setStoryRelated(num)
$('#storyPri' + num).val(storyInfo.pri);
$('#storyDesc' + num).val(storyInfo.spec);
});
+
+ storyLink = createLink('story', 'view', "storyID=" + storyID);
+ var concat = config.requestType != 'GET' ? '?' : '&';
+ storyLink = storyLink + concat + 'onlybody=yes';
+ $('#preview' + num).removeAttr('disabled');
+ $('#preview' + num).attr('href', storyLink);
+ }
+ else
+ {
+ storyLink = '#';
+ $('#preview' + num).attr('disabled', true);
+ $('#preview' + num).attr('href', storyLink);
}
}
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index de9ac54660..b2e93ec12c 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -64,11 +64,11 @@
<?php endif;?>
<th class='c-name required has-btn'><?php echo $lang->task->name;?></span></th>
<th class='w-80px required'><?php echo $lang->typeAB;?></span></th>
- <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
+ <th class='w-130px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
<th class='w-60px<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->task->deadline;?></th>
- <th class='w-200px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->task->desc;?></th>
+ <th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->task->desc;?></th>
<th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->task->pri;?></th>
</tr>
</thead>
@@ -106,6 +106,7 @@
<div class='input-group'>
<?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
<span class='input-group-btn'>
+ <a id='preview<?php echo $i;?>' href='#' class='btn iframe btn-link btn-icon btn-copy' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-search'></i></a>
<a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn btn-link btn-icon btn-copy' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-arrow-right'></i></a>
<?php echo html::hidden("storyEstimate$i") . html::hidden("storyDesc$i") . html::hidden("storyPri$i");?>
</span>
@@ -158,6 +159,7 @@
<div class='input-group'>
<?php echo html::select("story[%s]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated(\"%s\")'");?>
<span class='input-group-btn'>
+ <a id="preview%s" href='#' class='btn iframe btn-link btn-icon btn-copy' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-search'></i></a>
<a href='javascript:copyStoryTitle("%s")' class='btn btn-link btn-icon btn-copy' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-arrow-right'></i></a>
</span>
</div>