-
+
-
+
-
-
+
diff --git a/config/config.php.sample b/config/config.php.sample
new file mode 100644
index 00000000..9f4726ef
--- /dev/null
+++ b/config/config.php.sample
@@ -0,0 +1,34 @@
+ '68a77aa997d934d1259e729607233a',
+ 'version' => '1.0.3',
+ 'dbhost' => 'localhost',
+ 'dbname' => 'syspass',
+ 'debug' => 0,
+ 'logenabled' => 1,
+ 'ldapenabled' => 0,
+ 'mailenabled' => 0,
+ 'dbuser' => 'sp_admin',
+ 'dbpass' => 'mydb_secret_pass',
+ 'installed' => 0,
+ 'wikienabled' => 0,
+ 'demoenabled' => 0,
+ 'allowed_exts' => 'BAK,CSV,DOC,DOCX,GIF,JPG,ODS,ODT,PDF,PNG,TXT,VSD,XLS,XSL',
+ 'allowed_size' => 1024,
+ 'wikisearchurl' => 'http://wiki.foobar.com/wiki/doku.php/start?do=search&id=',
+ 'wikipageurl' => 'http://wiki.foobar.com/doku.php/',
+ 'wikifilter' => 'srv-',
+ 'ldapserver' => '',
+ 'ldapbase' => '',
+ 'ldapgroup' => '',
+ 'ldapuserattr' => '',
+ 'mailserver' => 'mail.foobar.com',
+ 'mailfrom' => 'syspass@foobar.com',
+ 'session_timeout' => 600,
+ 'account_link' => 1,
+ 'account_count' => 10,
+ 'sitelang' => 'en_US',
+ 'maintenance' => 0,
+ 'checkupdates' => 1,
+ 'filesenabled' => 1
+);
\ No newline at end of file
diff --git a/css/styles.css b/css/styles.css
index 5ab4e623..148d7bef 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -374,7 +374,7 @@ A:focus {text-decoration: none; color: #FF0000;}
color: #696969;
}
#content .data-header li a{color: #777;}
-#content .data-header li img{width: 24px; height: 24px; vertical-align: middle;}
+#content .data-header li img{float: right; width: 24px; height: 24px; vertical-align: middle;}
#content .data-rows ul{
display: table;
@@ -432,16 +432,17 @@ A:focus {text-decoration: none; color: #FF0000;}
#content #resEventLog .cell{text-align: center;}
#content #resEventLog .cell-description{width: 60%;}
-#content #tblTools SELECT, #tblTools INPUT{margin-left: 15px;}
#content #tblTools div.chosen-container{margin: 0 5px;}
-#content #tblTools select {width: 210px;}
-#content #tblTools #txtSearch{width:30%;}
+#content #tblTools #txtSearch,
+#content #tblTools select {width: 220px;}
#content #tblTools LABEL{margin-left:15px; color: #999;}
#content #tblTools IMG{margin-left:0.5em;}
#content #tblTools #toolsLeft{text-align: left; width: 80%;}
#content #tblTools #toolsRight{text-align: right; width: 5%;}
#content #tblTools #toolsRight input{margin-left: 15px; text-align: center;}
#content #tblTools .custom-combobox{margin-left: 25px;}
+#content #tblTools #btnClear{opacity: 0.35;filter:alpha(opacity=35);}
+#content #tblTools #btnClear:hover{opacity: 1;filter:alpha(opacity=100);}
#content #tabs>DIV{min-height: 475px;}
#content #tabs.ui-widget-content {border: none; background-color: transparent;}
diff --git a/inc/init.php b/inc/init.php
index 9c06dc6f..26b94cc9 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -391,14 +391,21 @@ class SP_Init {
* @brief Establece el lenguaje de la aplicación
* @returns none
*
- * Esta función establece el lenguaje según esté definidi en la configuración o en el navegador.
+ * Esta función establece el lenguaje según esté definido en la configuración o en el navegador.
*/
private static function selectLang(){
$browserLang = str_replace("-","_",substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 5));
$configLang = SP_Config::getValue('sitelang');
- self::$LANG = ( $configLang ) ? $configLang : $browserLang;
-
+ // Establecer a en_US si no existe la traducción o no es español
+ if ( ! file_exists( self::$SERVERROOT.'/inc/locales/'.$browserLang)
+ && ! preg_match('/^es_.*/i',$browserLang)
+ && ! $configLang ){
+ self::$LANG = 'en_US';
+ } else{
+ self::$LANG = ( $configLang ) ? $configLang : $browserLang;
+ }
+
putenv("LANG=".self::$LANG);
setlocale(LC_MESSAGES, self::$LANG);
setlocale(LC_ALL, self::$LANG);
diff --git a/inc/locales/en_US/LC_MESSAGES/messages.mo b/inc/locales/en_US/LC_MESSAGES/messages.mo
index a96f804b..8ec5177c 100644
Binary files a/inc/locales/en_US/LC_MESSAGES/messages.mo and b/inc/locales/en_US/LC_MESSAGES/messages.mo differ
diff --git a/inc/tpl/accounts.php b/inc/tpl/accounts.php
index dbba89be..99dbc955 100644
--- a/inc/tpl/accounts.php
+++ b/inc/tpl/accounts.php
@@ -131,20 +131,20 @@ $filesDelete = ( $action == 'accedit' ) ? 1 : 0;
$skey = SP_Common::getSessionKey(TRUE);
?>
-
-
+
+
- 
-
- 
-
+