Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	admin.settings.php
#	admin.settings_categories.php
#	backups/.htaccess
#	readme.md
  • Loading branch information
@nilsteampassnet
nilsteampassnet committed May 16, 2016
2 parents 1d69ff8 + 4386d9d commit e955e6c
Show file tree
Hide file tree
Showing 23 changed files with 62 additions and 572 deletions.
31 changes: 21 additions & 10 deletions admin.settings.load.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,18 @@ function(data) {
// build new row
$("#tbl_categories").append(
'<tr id="t_cat_'+data[0].id+'"><td colspan="2">'+
'<input type="text" id="catOrd_'+data[0].id+'" size="1" class="category_order" value="1" />&nbsp;'+
'<input type="text" id="catOrd_'+data[0].id+'" size="1" class="category_order" value="1" />&nbsp;&nbsp;'+
'<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
data[0].id+')" style="cursor:pointer;">'+
'<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-plus fa-stack-1x fa-inverse"></i>'+
'</span>&nbsp;'+
'<input type="radio" name="sel_item" id="item_'+data[0].id+'_cat" />'+
'<label for="item_'+data[0].id+'_cat" id="item_'+data[0].id+'">'+
$("#new_category_label").val()+'</label><a href="#" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
data[0].id+')" class="cpm_button tip" style="margin-left:20px;"><img src="includes/images/zone--plus.png" /></a></td><td>'+
'<a href="#" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+data[0].id+')" class="cpm_button tip" style="margin-left:5px;"><img src="includes/images/folder_edit.png" /></a>'+
$("#new_category_label").val()+'</label>'+
'</td><td>'+
'<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+data[0].id+')" style="cursor:pointer;">'+
'<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-edit fa-stack-1x fa-inverse"></i>'+
'</span>&nbsp;'+
'<?php echo $LANG['category_in_folders_title'];?>:'+
'<span style="font-family:italic; margin-left:10px;" id="catFolders_'+data[0].id+'"></span>'+
'<input type="hidden" id="catFoldersList_'+data[0].id+'" value="'+data[0].id+'" /></td><td></td>');
Expand Down Expand Up @@ -169,11 +175,16 @@ function(data) {
if (val[0] == 1) {
newList += '<tr id="t_cat_'+val[1]+'"><td colspan="2">'+
'<input type="text" id="catOrd_'+val[1]+'" size="1" class="category_order" value="'+val[3]+'" />&nbsp;'+
'<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
val[1]+')" style="cursor:pointer;">'+
'<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-plus fa-stack-1x fa-inverse"></i>'+
'</span>&nbsp;'+
'<input type="radio" name="sel_item" id="item_'+val[1]+'_cat" />'+
'<label for="item_'+val[1]+'_cat" id="item_'+val[1]+'">'+val[2]+'</label>'+
'<a href="#" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+val[1]+')" class="cpm_button tip" style="margin-left:20px;">'+
'<img src="includes/images/zone--plus.png" /></a></td>'+
'<td><a href="#" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+val[1]+')" class="cpm_button tip" style="margin-left:5px;"><img src="includes/images/folder_edit.png" /></a>'+
'</td><td>'+
'<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+val[1]+')" style="cursor:pointer;">'+
'<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-edit fa-stack-1x fa-inverse"></i>'+
'</span>&nbsp;'+
'<?php echo $LANG['category_in_folders_title'];?>:'+
'<span style="font-family:italic; margin-left:10px;" id="catFolders_'+val[1]+'">'+val[4]+'</span>'+
'<input type="hidden" id="catFoldersList_'+val[1]+'" value="'+val[5]+'" /></td></tr>';
Expand Down Expand Up @@ -687,10 +698,10 @@ function(data) {
$("#new_salt_key").keypress(function (e) {
var key = e.charCode || e.keyCode || 0;
if ($("#new_salt_key").val().length != 16) {
$("#change_salt_key_image").attr("src", "includes/images/cross.png");
$("#change_salt_key_image").html('<i class="fa fa-cross mi-red"></i>');
$("#change_salt_key_but").hide();
} else {
$("#change_salt_key_image").attr("src", "includes/images/tick.png");
$("#change_salt_key_image").html('<i class="fa fa-check mi-green"></i>');
$("#change_salt_key_but").show();
}
// allow backspace, tab, delete, arrows, letters, numbers and keypad numbers ONLY
Expand All @@ -717,7 +728,7 @@ function(data) {
if (data[0].continu == true ) {
manageEncryptionOfAttachments(data[0].list, data[0].cpt);
} else {
$("#result_admin_action_attachments_cryption").html("<img src='includes/images/tick.png' alt='' /> "+data[0].cpt+" files changed");
$("#result_admin_action_attachments_cryption").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].cpt+" files changed");
}
},
"json"
Expand Down
7 changes: 3 additions & 4 deletions admin.settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ function updateSettings ($setting, $val, $type = '')
<i class="fa fa-cogs fa-stack-1x fa-inverse"></i>
</span>
<label>'.$LANG['admin_action_check_pf'].'</label>
<span id="result_admin_action_check_pf" style="margin-left:10px;display:none;"><img src="includes/images/tick.png" alt="" /></span>
<span id="result_admin_action_check_pf" style="margin-left:10px;display:none;"></span>
</div>';
// Clean DB with orphan items
echo '
Expand Down Expand Up @@ -1114,7 +1114,7 @@ function updateSettings ($setting, $val, $type = '')
<label>'.$LANG['admin_action_change_salt_key'].'</label>
<span style="margin-left:0px;">&nbsp;<i class="fa fa-question-circle tip" title="'.$LANG['admin_action_change_salt_key_tip'].'"></i></span>
<span id="div_change_salt_key" style="margin-left:10px;display:none;">
<input type="text" id="new_salt_key" size="50" value="'.SALT.'" /><img src="includes/images/cross.png" id="change_salt_key_image">&nbsp;
<input type="text" id="new_salt_key" size="50" value="'.SALT.'" /><span id="change_salt_key_image"></span>&nbsp;
<span class="fa fa-asterisk" style="cursor:pointer;display:none;" onclick="changeMainSaltKey(\'starting\')" id="change_salt_key_but"></span>
&nbsp;<span id="changeMainSaltKey_message"></span>
</span>
Expand Down Expand Up @@ -1618,8 +1618,7 @@ function updateSettings ($setting, $val, $type = '')
// LDAP
echo '
<tr>
<td><label for="ldap_usergroup">'.$LANG['settings_ldap_usergroup'].'&nbsp;<img src="includes/images/question-small-white.png" class="tip" alt="" title="'.
$LANG['settings_ldap_usergroup_tip'].'" /></label></td>
<td><label for="ldap_usergroup">'.$LANG['settings_ldap_usergroup'].'&nbsp;<i class="fa fa-question-circle tip" title="'.$LANG['settings_ldap_usergroup_tip'].'"></i></label></td>
<td><input type="text" size="50" id="ldap_usergroup" name="ldap_usergroup" class="text ui-widget-content" title="uid" value="',
isset($_SESSION['settings']['ldap_usergroup']) ? $_SESSION['settings']['ldap_usergroup'] : '', '" /></td>
</tr>';
Expand Down
30 changes: 15 additions & 15 deletions admin.settings_categories.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 2.1.26
* @copyright (c) 2009-2015 Nils Laumaillé
* @licensing GNU AFFERO GPL 3.0
* @link http://www.teampass.net
* @link http://www.teampass.net
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand Down Expand Up @@ -82,8 +82,8 @@

echo '
<div id="tabs-8">
<div id="categories_list">
<table id="tbl_categories" style="">';
<div id="categories_list">
<table id="tbl_categories" style="">';

if (isset($arrCategories) && count($arrCategories) > 0) {
// build table
Expand Down Expand Up @@ -111,20 +111,20 @@
<tr id="t_cat_'.$category[0].'">
<td colspan="2">
<input type="text" id="catOrd_'.$category[0].'" size="1" class="category_order" value="'.$category[2].'" />&nbsp;
<span class="fa-stack tip" title="'.$LANG['field_add_in_category'].'" onclick="fieldAdd('.$category[0].')" style="cursor:pointer;">
<i class="fa fa-square fa-stack-2x"></i>
<i class="fa fa-plus fa-stack-1x fa-inverse"></i>
</span>
&nbsp;
<span class="fa-stack tip" title="'.$LANG['field_add_in_category'].'" onclick="fieldAdd('.$category[0].')" style="cursor:pointer;">
<i class="fa fa-square fa-stack-2x"></i>
<i class="fa fa-plus fa-stack-1x fa-inverse"></i>
</span>
&nbsp;
<input type="radio" name="sel_item" id="item_'.$category[0].'_cat" />
<label for="item_'.$category[0].'_cat" id="item_'.$category[0].'" style="font-weight:bold;">'.$category[1].'</label>
</td>
<td>
<span class="fa-stack tip" title="'.$LANG['category_in_folders'].'" onclick="catInFolders('.$category[0].')" style="cursor:pointer;">
<i class="fa fa-square fa-stack-2x"></i>
<i class="fa fa-edit fa-stack-1x fa-inverse"></i>
</span>
&nbsp;
<td>
<span class="fa-stack tip" title="'.$LANG['category_in_folders'].'" onclick="catInFolders('.$category[0].')" style="cursor:pointer;">
<i class="fa fa-square fa-stack-2x"></i>
<i class="fa fa-edit fa-stack-1x fa-inverse"></i>
</span>
&nbsp;
'.$LANG['category_in_folders_title'].':
<span style="font-family:italic; margin-left:10px;" id="catFolders_'.$category[0].'">'.$foldersList.'</span>
<input type="hidden" id="catFoldersList_'.$category[0].'" value="'.$foldersNumList.'" />
Expand Down Expand Up @@ -155,7 +155,7 @@

}
echo '
</table>
</table>
</div>';

if (!isset($arrCategories) || count($arrCategories) == 0) {
Expand Down
4 changes: 1 addition & 3 deletions backups/.htaccess
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
<Files ~ "\.php$>
Order Allow,Deny
Deny from all
</Files>
Deny from all
126 changes: 0 additions & 126 deletions home.load.php
View file

This file was deleted.

Loading

0 comments on commit e955e6c

Please sign in to comment.