MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' into feature/attribute-tagging

pull/1857/head
Iglocska 2017-01-17 13:58:48 +01:00
parent fbcb7480a0 35aaa398cd
commit e0c7c000ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/SharingGroups/add.ctp
View File

@ -16,7 +16,7 @@
<textarea class="input-xxlarge" placeholder="A description of the sharing group." cols="30" rows="6" id="SharingGroupDescription"></textarea>
<div style="display:block;">
<input type="checkbox" style="float:left;" title="Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled." value="1" id="SharingGroupActive" checked></input>
<label for="SharingGroupActive" style="padding-left:20px;">Make the sharing group selectable</label>
<label for="SharingGroupActive" style="padding-left:20px;">Make the sharing group selectable (active)</label>
</div>
<span class="btn btn-inverse" onClick="simpleTabPage(2);">Next page</span>
</div>

2
app/View/SharingGroups/edit.ctp
View File

@ -16,7 +16,7 @@
<textarea class="input-xxlarge" placeholder="A description of the sharing group." cols="30" rows="6" id="SharingGroupDescription"><?php echo h($sharingGroup['SharingGroup']['description']); ?></textarea>
<div style="display:block;">
<input type="checkbox" style="float:left;" title="Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled." <?php if ($sharingGroup['SharingGroup']['active']) echo "checked"; ?> id="SharingGroupActive"></input>
<label for="SharingGroupActive" style="padding-left:20px;">Make the sharing group selectable</label>
<label for="SharingGroupActive" style="padding-left:20px;">Make the sharing group selectable (active)</label>
</div>
<span class="btn btn-inverse" onClick="simpleTabPage(2);">Next page</span>
</div>