Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop

build/debian/rules

@@ -104,7 +104,6 @@ clean:
 	rm -fr htdocs/includes/jquery/plugins/flot
 	rm -fr htdocs/includes/jquery/plugins/jstree
 	rm -fr htdocs/includes/jquery/plugins/lightbox
-	rm -fr htdocs/includes/jquery/plugins/mobile
 	rm -fr htdocs/includes/jquery/plugins/multiselect
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip

htdocs/core/boxes/box_actions.php

@@ -101,7 +101,7 @@ class box_actions extends ModeleBoxes
 					'logo' => ("action"),
 					'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id);
 
-					$this->info_box_contents[$i][1] = array('td' => 'align="left" nowrap="1"',
+					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
 					'text' => dol_trunc($label,32),
 					'text2'=> $late,
 					'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id);

htdocs/core/getmenu_jmobile.php

@@ -50,7 +50,7 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
  * View
  */
 
-// URL http://mydolibarr/core/getmenu_jmobime?mainmenu=mainmenu&leftmenu=leftmenu can be used for tests
+// URL http://mydolibarr/core/getmenu_jmobile?mainmenu=mainmenu&leftmenu=leftmenu can be used for tests
 $arrayofjs=array('/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js');
 $arrayofcss=array('/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css');
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);

htdocs/core/lib/functions.lib.php

@@ -1581,7 +1581,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
  *  MAIN_DISABLE_TRUNC=1 can disable all truncings
  *
  *	@param	string	$string				String to truncate
- *	@param  int		$size				Max string size visible. 0 for no limit. finale string size can be 1 more (if size was max+1) or 3 more (if we added ...)
+ *	@param  int		$size				Max string size visible. 0 for no limit. Final string size can be 1 more (if size was max+1) or 3 more (if we added ...)
  *	@param	string	$trunc				Where to trunc: right, left, middle (size must be a 2 power), wrap
  * 	@param	string	$stringencoding		Tell what is source string encoding
  *  @param	int		$nodot				Truncation do not add ... after truncation. So it's an exact truncation.

htdocs/fourn/class/fournisseur.facture.class.php

@@ -310,7 +310,7 @@ class FactureFournisseur extends CommonInvoice
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id					= $obj->rowid;
-                $this->ref					= $obj->ref;
+                $this->ref					= $obj->ref?$obj->ref:$obj->rowid;	// We take rowid if ref is empty for backward compatibility
 
                 $this->ref_supplier			= $obj->ref_supplier;
                 $this->entity				= $obj->entity;
@@ -1316,8 +1316,11 @@ class FactureFournisseur extends CommonInvoice
         $label=$langs->trans("ShowInvoice").': '.$this->ref;
         if ($this->ref_supplier) $label.=' / '.$this->ref_supplier;
 
+        $ref=$this->ref;
+        if (empty($ref)) $ref=$this->id;
+
         if ($withpicto) $result.=($lien.img_object($label,'bill').$lienfin.' ');
-        $result.=$lien.($max?dol_trunc($this->ref,$max):$this->ref).$lienfin;
+        $result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin;
         return $result;
     }
 

htdocs/index.php

@@ -260,7 +260,7 @@ print '<th class="liste_titre"align="right">'.$langs->trans("Number").'</th>';
 print '<th class="liste_titre"align="right">'.$langs->trans("Late").'</th>';
 print '<th class="liste_titre">&nbsp;</th>';
 print '<th class="liste_titre"width="20">&nbsp;</th>';
-if ($showweather) print '<th class="liste_titre" width="80">&nbsp;</th>';
+if ($showweather) print '<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
 print '</tr>';
 
 
@@ -483,7 +483,7 @@ foreach($dashboardlines as $key => $board)
     print '</td>';
     if ($showweather)
     {
-        print '<td class="nohover" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
+        print '<td class="nohover hideonsmartphone" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
         $text='';
         if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
         $options='height="64px"';

htdocs/main.inc.php

@@ -647,9 +647,6 @@ if (! defined('NOLOGIN'))
         $conf->css  = "/theme/".$conf->theme."/style.css.php";
     }
 
-    // If theme support option like flip-hide left menu and we use a smartphone, we force it
-    if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced';
-
     // Set javascript option
     if (! GETPOST('nojs'))   // If javascript was not disabled on URL
     {
@@ -949,6 +946,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css" />'."\n";
             }
+            // jQuery jMobile
+            if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || GETPOST('jmobile'))
+            {
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />'."\n";
+            }
         }
 
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
@@ -969,6 +971,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         }
         $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+        if (GETPOST('dol_hide_topmenu'))  $themeparam.='&amp;dol_hide_topmenu=1';
+        if (GETPOST('dol_hide_leftmenu')) $themeparam.='&amp;dol_hide_leftmenu=1';
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" title="default" href="'.$themepath.$themeparam.'">'."\n";
 
@@ -1005,11 +1009,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
 
-        // Output standard javascript links
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
-        {
         $ext='.js';
 
+        // Output standard javascript links
+        if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+        {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->'."\n";
             if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min'.$ext.'"></script>'."\n";
@@ -1101,6 +1105,21 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/js/ui.multiselect.js"></script>'."\n";
             }
+            // jQuery Timepicker
+            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+            {
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
+            }
+            // jQuery jMobile
+            if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || GETPOST('jmobile'))
+            {
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>'."\n";
+            }
+        }
+
+        if (! $disablejs && ! empty($conf->use_javascript_ajax))
+        {
             // CKEditor
             if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor'))
             {
@@ -1115,11 +1134,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '</script>'."\n";
                 print '<script type="text/javascript" src="'.$pathckeditor.'ckeditor_basic.js"></script>'."\n";
             }
-            // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>'."\n";
-            }
 
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
@@ -1128,12 +1142,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             // Add datepicker default options
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
 
-            // add timepicker default options
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
-            }
-
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{

htdocs/theme/eldy/style.css.php

@@ -356,7 +356,7 @@ td.showDragHandle {
 /* ============================================================================== */
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?((empty($_SESSION['dol_hide_leftmenu']) && ! GETPOST('dol_hide_leftmenu')) ?'20':'4'):'24')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?((empty($_SESSION['dol_hide_leftmenu']) && ! GETPOST('dol_hide_leftmenu'))?'20':'4'):'24')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->browser->phone)?'12':'6')); ?>px;
 }
 

htdocs/theme/phones/index.php

@@ -1 +0,0 @@
-Url not available

htdocs/theme/phones/smartphone/AUTHOR

@@ -1 +0,0 @@
-2009-2010 Regis Houssin <regis.houssin@capnetworks.com>

htdocs/theme/phones/smartphone/index.php

@@ -1 +0,0 @@
-Url not available

htdocs/theme/phones/smartphone/theme/default/default.css.php

@@ -1,531 +0,0 @@
-<?php
-/* Copyright (C) 2009-2010 Regis Houssin	<regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *		\file       htdocs/theme/phones/smartphone/theme/default/default.css.php
- *		\brief      Fichier de style CSS du theme Smartphone default
- */
-
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
-
-session_cache_limiter(FALSE);
-
-require_once '../../../../../main.inc.php';
-
-// Define css type
-header('Content-type: text/css');
-// Important: Avoid page request by browser and dynamic build at
-// each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-else header('Cache-Control: no-cache');
-
-// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
-
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on URL
-$langs->load("main",0,1);
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
-
-?>
-.ui-mobile-viewport {
-/*width:600px;
-height:600px;
-min-height: 200px;
-min-width: 600px;
-overflow:scroll; */
-}
-
-.landscape, .landscape .ui-page {
-}
-
-#dol-homeheader { height: 40px; font-size: 16px; }
-
-.ui-mobile-viewport {
-    margin: 0;
-}
-
-.ui-header { height: 40px; font-size: 16px; }
-
-.ui-content {
-padding-top: 1px;
-padding-right: 0;
-padding-bottom: 0px;
-padding-left: 1px;
-}
-
-.ui-content .ui-listview {
-    margin-top: 0px;   /* Use here negative value of ui-content top padding */
-    margin-right: 0px;
-    margin-bottom: 0px;
-    margin-left: 0px;
-    /* overflow: scroll; */
-}
-
-.ui-mobile #dol-homeheader { padding: 10px 5px 0; text-align: center }
-.ui-mobile #dol-homeheader h1 { margin: 0 0 10px; }
-.ui-mobile #dol-homeheader p { margin: 0; }
-
-.ui-li-icon {
-	left:5px;
-	top:0.3em;
-}
-
-.ui-li .ui-btn-inner {
-    padding: 0.4em 5px 0.4em 5px;
-}
-
-input.ui-input-text, textarea.ui-input-text {
-	padding: 0.2em;
-}
-
-.ui-body-b {
-    background: #FFFFFF;
-}
-
-.ui-body-c {
-    background: #FFFFFF;
-    text-shadow: none;
-}
-
-.loginform {
-    margin-left: 10px;
-    margin-right: 10px;
-    padding: 5px;
-}
-
-
-
-
-/* ============================================================================== */
-/* Styles de positionnement des zones                                             */
-/* ============================================================================== */
-
-div.fiche {
-	margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone)?'10':'2'); ?>px;
-	margin-<?php print $right; ?>: <?php print (empty($conf->browser->phone)?'6':''); ?>px;
-}
-
-div.fichecenter {
-	width: 100%;
-	clear: both;	/* This is to have div fichecenter that are true rectangles */
-}
-div.fichethirdleft {
-	<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
-	<?php if (empty($conf->browser->phone)) { print "width: 35%;\n"; } ?>
-}
-div.fichetwothirdright {
-	<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
-	<?php if (empty($conf->browser->phone)) { print "width: 65%;\n"; } ?>
-}
-div.fichehalfleft {
-	<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
-	<?php if (empty($conf->browser->phone)) { print "width: 50%;\n"; } ?>
-}
-div.fichehalfright {
-	<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
-	<?php if (empty($conf->browser->phone)) { print "width: 50%;\n"; } ?>
-}
-div.ficheaddleft {
-	<?php if (empty($conf->browser->phone)) { print "padding-left: 6px;\n"; } ?>
-}
-
-
-/* ============================================================================== */
-/* Boutons actions                                                                */
-/* ============================================================================== */
-
-.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
-    overflow: hidden;
-    padding: 0.6em 25px;
-    position: relative;
-    white-space: nowrap;
-
-	font-family: <?php print $fontlist ?>;
-	background: white;
-	border: 1px solid #8CACBB;
-	color: #436976;
-	padding: 0em 0.7em;
-	margin: 0em 0.5em;
-	text-decoration: none;
-	white-space: nowrap;
-}
-
-.butAction:hover   {
-	background: #dee7ec;
-}
-
-.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
-    border: 1px solid #997777;
-}
-
-.butActionDelete:hover {
-    background: #FFe7ec;
-}
-
-.butActionRefused {
-	font-family: <?php print $fontlist ?> !important;
-	font-weight: bold !important;
-	background: white !important;
-	border: 1px solid #AAAAAA !important;
-	color: #AAAAAA !important;
-	padding: 0em 0.7em !important;
-	margin: 0em 0.5em !important;
-	text-decoration: none !important;
-	white-space: nowrap !important;
-	cursor: not-allowed;
-}
-
-span.butAction, span.butActionDelete {
-	cursor: pointer;
-}
-
-
-/* ============================================================================== */
-/* Tables                                                                         */
-/* ============================================================================== */
-
-/*
-#undertopmenu {
-background-image: url("<?php echo DOL_URL_ROOT.'/theme/eldy/img/gradient.gif' ?>");
-background-repeat: repeat-x;
-}
-*/
-
-
-.nocellnopadd {
-list-style-type:none;
-margin: 0px;
-padding: 0px;
-}
-
-.notopnoleft {
-border-collapse: collapse;
-border: 0px;
-padding-top: 0px;
-padding-<?php print $left; ?>: 0px;
-padding-<?php print $right; ?>: 4px;
-padding-bottom: 4px;
-margin: 0px 0px;
-}
-.notopnoleftnoright {
-border-collapse: collapse;
-border: 0px;
-padding-top: 0px;
-padding-left: 0px;
-padding-right: 0px;
-padding-bottom: 4px;
-margin: 0px 0px 0px 0px;
-}
-
-
-table.border {
-border: 1px solid #9CACBB;
-border-collapse: collapse;
-}
-
-table.border td {
-padding: 1px 2px;
-border: 1px solid #9CACBB;
-border-collapse: collapse;
-}
-
-td.border {
-border-top: 1px solid #000000;
-border-right: 1px solid #000000;
-border-bottom: 1px solid #000000;
-border-left: 1px solid #000000;
-}
-
-
-/* Main boxes */
-
-table.noborder {
-border-collapse: collapse;
-border-top-color: #FEFEFE;
-
-border-right-width: 1px;
-border-right-color: #BBBBBB;
-border-right-style: solid;
-
-border-left-width: 1px;
-border-left-color: #BBBBBB;
-border-left-style: solid;
-
-border-bottom-width: 1px;
-border-bottom-color: #BBBBBB;
-border-bottom-style: solid;
-
-margin: 0px 0px 2px 0px;
-}
-
-table.noborder tr {
-border-top-color: #FEFEFE;
-
-border-right-width: 1px;
-border-right-color: #BBBBBB;
-border-right-style: solid;
-
-border-left-width: 1px;
-border-left-color: #BBBBBB;
-border-left-style: solid;
-height: 16px;
-}
-
-table.noborder td {
-padding: 1px 2px 0px 1px;			/* t r b l */
-}
-
-table.nobordernopadding {
-border-collapse: collapse;
-border: 0px;
-}
-table.nobordernopadding tr {
-border: 0px;
-padding: 0px 0px;
-}
-table.nobordernopadding td {
-border: 0px;
-padding: 0px 0px;
-}
-
-
-
-tr.liste_titre
-{
-    height: 24px;
-    background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
-    border: 1px solid #456F9A;
-    color: #FFFFFF;
-    font-family: <?php print $fontlist ?>;
-    /* border-bottom: 1px solid #FDFFFF; */
-    white-space: nowrap;
-}
-th.liste_titre, td.liste_titre
-{
-    background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
-    border: 1px solid #456F9A;
-    color: #FFFFFF;
-    font-family: <?php print $fontlist ?>;
-    font-weight: normal;
-    /* border-bottom: 1px solid #FDFFFF; */
-    white-space: nowrap;
-    text-align: <?php echo $left; ?>;
-}
-th.liste_titre_sel, td.liste_titre_sel
-{
-    background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
-    color: #FFFFFF;
-    font-family: <?php print $fontlist ?>;
-    font-weight: normal;
-    /* text-decoration: underline; */
-    /* border-bottom: 1px solid #FDFFFF; */
-    white-space: nowrap;
-    text-align: <?php echo $left; ?>;
-}
-input.liste_titre {
-background: transparent;
-background-repeat: repeat-x;
-border: 0px;
-}
-
-tr.liste_total td {
-border-top: 1px solid #DDDDDD;
-background: #F0F0F0;
-background-repeat: repeat-x;
-color: #332266;
-font-weight: normal;
-white-space: nowrap;
-}
-
-
-.impair {
-/* background: #d0d4d7; */
-background: #eaeaea;
-font-family: <?php print $fontlist ?>;
-border: 0px;
-}
-/*
-.impair:hover {
-background: #c0c4c7;
-border: 0px;
-}
-*/
-
-.pair	{
-/* background: #e6ebed; */
-background: #f4f4f4;
-font-family: <?php print $fontlist ?>;
-border: 0px;
-}
-/*
-.pair:hover {
-background: #c0c4c7;
-border: 0px;
-}
-*/
-
-
-
-div.titre {
-	padding-top: 10px;
-	font-family: <?php print $fontlist ?>;
-	font-weight: normal;
-	color: #336666;
-	text-decoration: none;
-}
-
-
-
-/* ============================================================================== */
-/* Onglets                                                                        */
-/* ============================================================================== */
-
-div.tabs {
-    top: 20px;
-    margin: 1px 0px 0px 0px;
-    padding: 0px 6px 0px 0px;
-    text-align: <?php print $left; ?>;
-}
-
-div.tabBar {
-    color: #234046;
-    padding-top: 10px;
-    padding-left: 8px;
-    padding-right: 8px;
-    padding-bottom: 8px;
-    margin: 0px 0px 10px 0px;
-    -moz-border-radius-topleft:6px;
-    -moz-border-radius-topright:6px;
-    -moz-border-radius-bottomleft:6px;
-    -moz-border-radius-bottomright:6px;
-    border-right: 1px solid #555555;
-    border-bottom: 1px solid #555555;
-    border-left: 1px solid #D0D0D0;
-    border-top: 1px solid #D8D8D8;
-    background: #dee7ec url(<?php echo DOL_URL_ROOT.'/theme/auguria/img/tab_background.png' ?>) repeat-x;
-}
-
-div.tabsAction {
-    margin: 20px 0em 1px 0em;
-    padding: 0em 0em;
-    text-align: right;
-}
-
-
-a.tabTitle {
-	display: none;
-}
-
-a.tab:link {
-    background: #dee7ec;
-    color: #436976;
-	font-family: <?php print $fontlist ?>;
-    padding: 0px 6px;
-    margin: 0em 0.2em;
-    text-decoration: none;
-    white-space: nowrap;
-    -moz-border-radius-topleft:6px;
-    -moz-border-radius-topright:6px;
-
-    border-<?php print $right; ?>: 1px solid #555555;
-    border-<?php print $left; ?>: 1px solid #D8D8D8;
-    border-top: 1px solid #D8D8D8;
-}
-a.tab:visited {
-    background: #dee7ec;
-    color: #436976;
-	font-family: <?php print $fontlist ?>;
-    padding: 0px 6px;
-    margin: 0em 0.2em;
-    text-decoration: none;
-    white-space: nowrap;
-    -moz-border-radius-topleft:6px;
-    -moz-border-radius-topright:6px;
-
-    border-<?php print $right; ?>: 1px solid #555555;
-    border-<?php print $left; ?>: 1px solid #D8D8D8;
-    border-top: 1px solid #D8D8D8;
-}
-a.tab#active {
-    background: white;
-    border-bottom: #dee7ec 1px solid;
-	font-family: <?php print $fontlist ?>;
-    color: #436976;
-    padding: 0px 6px;
-    margin: 0em 0.2em;
-    text-decoration: none;
-    -moz-border-radius-topleft:6px;
-    -moz-border-radius-topright:6px;
-
-    border-<?php print $right; ?>: 1px solid #555555;
-    border-<?php print $left; ?>: 1px solid #D8D8D8;
-    border-top: 1px solid #D8D8D8;
-    border-bottom: 1px solid white;
-}
-a.tab:hover {
-    background: white;
-    color: #436976;
-	font-family: <?php print $fontlist ?>;
-    padding: 0px 6px;
-    margin: 0em 0.2em;
-    text-decoration: none;
-    -moz-border-radius-topleft:6px;
-    -moz-border-radius-topright:6px;
-
-    border-<?php print $right; ?>: 1px solid #555555;
-    border-<?php print $left; ?>: 1px solid #D8D8D8;
-    border-top: 1px solid #D8D8D8;
-}
-
-a.tabimage {
-    color: #436976;
-	font-family: <?php print $fontlist ?>;
-    text-decoration: none;
-    white-space: nowrap;
-}
-
-td.tab {
-    background: #dee7ec;
-}
-
-span.tabspan {
-    background: #dee7ec;
-    color: #436976;
-	font-family: <?php print $fontlist ?>;
-    padding: 0px 6px;
-    margin: 0em 0.2em;
-    text-decoration: none;
-    white-space: nowrap;
-    -moz-border-radius-topleft:6px;
-    -moz-border-radius-topright:6px;
-
-    border-<?php print $right; ?>: 1px solid #555555;
-    border-<?php print $left; ?>: 1px solid #D8D8D8;
-    border-top: 1px solid #D8D8D8;
-}
-

htdocs/theme/phones/smartphone/theme/default/index.php

@@ -1 +0,0 @@
-Url not available

htdocs/theme/phones/smartphone/tpl/header.tpl.php

@@ -1,28 +0,0 @@
-<?php
-/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-?>
-<head>
-<title><?php echo $title; ?></title>
-<meta name="robots" content="noindex,nofollow" />
-<meta name="apple-mobile-web-app-capable" content="yes" />
-<link rel="apple-touch-icon" href="<?php echo DOL_URL_ROOT.'/theme/phones/smartphone/theme/'.$conf->theme.'/img/homescreen.png'; ?>" />
-<link rel="stylesheet" href="<?php echo DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css'; ?>" />
-<link rel="stylesheet" href="<?php echo DOL_URL_ROOT.'/theme/phones/smartphone/theme/default/default.css.php'; ?>" />
-<script type="text/javascript" src="<?php echo DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min.js'; ?>"></script>
-<script type="text/javascript" src="<?php echo DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js'; ?>"></script>
-</head>

htdocs/theme/phones/smartphone/tpl/index.php

@@ -1 +0,0 @@
-Url not available

htdocs/theme/phones/smartphone/tpl/login.tpl.php

@@ -1,104 +0,0 @@
-<?php
-/* Copyright (C) 2009-2010 Regis Houssin <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-top_httphead();
-?>
-<!DOCTYPE html>
-<html>
-<?php
-include 'header.tpl.php';
-?>
-<body>
-<script type="text/javascript">
-jQuery(document).bind("mobileinit", function(){
-    jQuery.mobile.defaultTransition('pop');
-});
-</script>
-
-<!-- START LOGIN SMARTPHONE TEMPLATE -->
-<div data-role="page" id="dol-home" data-theme="b">
-
-	<div data-role="header" data-nobackbtn="true" data-theme="b">
-        <div id="dol-homeheader">
-        <?php
-        $appli='Dolibarr';
-        if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-        print $appli;
-        ?>
-        </div>
-	</div>
-
-	<div data-role="content">
-
-		<form id="login" class="loginform" name="login" method="post" action="<?php echo $php_self; ?>">
-		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-		<input type="hidden" name="loginfunction" value="loginfunction" />
-
-		<div data-role="fieldcontain">
-			<label for="username"><?php echo $langs->trans('Login'); ?></label>
-			<input type="text" name="username" id="username" value="<?php echo $login; ?>"  />
-
-			<br><label for="password"><?php echo $langs->trans('Password'); ?></label>
-			<input type="password" name="password" id="password" value="<?php echo $password; ?>" />
-
-			<?php if ($select_entity) { ?>
-			<br><label for="entity" class="select"><?php echo $langs->trans('Entity'); ?></label>
-			<?php echo $select_entity; ?>
-			<?php } ?>
-
-			<?php if ($captcha) { ?>
-			<label for="securitycode"><?php echo $langs->trans('SecurityCode'); ?></label>
-			<input type="text" id="securitycode" name="securitycode" />
-			<div align="center"><img src="<?php echo $dol_url_root.'/core/antispamimage.php'; ?>" border="0" width="80" height="32" /></div>
-			<?php } ?>
-		</div>
-
-		<input type="submit" data-theme="b" value="<?php echo $langs->trans('Connection'); ?>" />
-
-		</form>
-
-	</div><!-- /content -->
-
-	<?php if ($forgetpasslink || $helpcenterlink) { ?>
-	<div data-role="footer" data-id="foo1" data-theme="b">
-		<div data-role="navbar">
-			<ul>
-			<li>
-		<?php if ($forgetpasslink) { ?>
-			<a href="<?php echo $dol_url_root.'/user/passwordforgotten.php'; ?>" data-icon="gear"><?php echo $langs->trans('PasswordForgotten'); ?></a>
-		<?php } ?>
-            </li>
-            <li>
-        <?php if ($helpcenterlink && 1 == 2) { ?>
-            <a href="<?php echo $dol_url_root.'/support/index.php'; ?>" data-icon="info"><?php echo $langs->trans('NeedHelpCenter'); ?></a>
-        <?php } ?>
-            </li>
-        	</ul>
-		</div>
-	</div>
-	<?php } ?>
-</div><!-- /page -->
-
-<?php if ($dol_loginmesg) { ?>
-	<script type="text/javascript">
-		alert('<?php echo $dol_loginmesg; ?>');
-	</script>
-<?php } ?>
-<!-- END LOGIN SMARTPHONE TEMPLATE -->
-
-</body>
-</html>

htdocs/theme/phones/smartphone/tpl/menu.tpl.php

@@ -1,80 +0,0 @@
-<?php
-/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Load the smartphone menu manager
-$result=@include_once DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu;
-if (! $result)	// If failed to include, we try with standard
-{
-	$conf->smart_menu='smartphone_menu.php';
-	include_once DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu;
-}
-$menusmart = new MenuSmart($db, $user->societe_id?1:0);
-
-
-top_httphead();
-?>
-<!DOCTYPE html>
-<html>
-<?php
-require 'header.tpl.php';
-?>
-<body>
-<script type="text/javascript">
-jQuery(document).bind("mobileinit", function(){
-    jQuery.mobile.defaultTransition('pop');
-});
-</script>
-
-<div data-role="page" data-theme="b" id="dol-home">
-
-	<div data-role="header" data-nobackbtn="true" data-theme="b">
-		<div id="dol-homeheader">
-            <?php
-            $appli='Dolibarr';
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-            print $appli;
-            ?>
-		</div>
-	</div>
-
-    <div data-role="content">
-<!--
-        <ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
-            <li data-role="list-divider">Overview</li>
-            <li><a href="http://jquerymobile.com/test/docs/about/intro.html">Intro to jQuery Mobile</a></li>
-            <li><a href="http://localhost/dolibarrnew/public/error-401.php">Features</a></li>
-        </ul>
--->
-
-	<?php $menusmart->showmenu(1); ?>
-
-	</div><!-- /content -->
-
-	<div data-role="footer" data-theme="b">
-		<div data-role="navbar">
-			<ul>
-				<li><a href="<?php echo DOL_URL_ROOT.'/user/logout.php'; ?>" data-icon="grid"><?php echo $langs->trans("Logout"); ?></a></li>
-				<li><a href="">&nbsp;</a></li>
-			</ul>
-		</div><!-- /navbar -->
-	</div><!-- /footer -->
-
-</div><!-- /page -->
-
-<!-- END MENU SMARTPHONE TEMPLATE -->
-</body>
-</html>

htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php

@@ -1,82 +0,0 @@
-<?php
-/* Copyright (C) 2009-2010 Regis Houssin <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-top_httphead();
-?>
-<!DOCTYPE html>
-<html>
-<?php
-include 'header.tpl.php';
-?>
-<body>
-<!-- BEGIN SMARTPHONE TEMPLATE -->
-
-<div data-role="page" id="dol-home" data-theme="b">
-
-	<div data-role="header" data-theme="b" data-position="inline">
-			<div id="dol-homeheader">
-			<?php echo $langs->trans('Identification'); ?>
-			</div>
-	</div>
-
-	<div data-role="content">
-
-		<form id="login" class="loginform" name="login" method="post" action="<?php echo $php_self; ?>">
-		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-		<input type="hidden" name="loginfunction" value="buildnewpassword" />
-
-		<div data-role="fieldcontain">
-			<label for="username"><?php echo $langs->trans('Login'); ?></label>
-			<input type="text" name="username" id="username" value="<?php echo $login; ?>"  />
-
-			<?php if ($select_entity) { ?>
-			<label for="entity" class="select"><?php echo $langs->trans('Entity'); ?></label>
-			<?php echo $select_entity; ?>
-			<?php } ?>
-
-			<?php if ($captcha) { ?>
-			<label for="securitycode"><?php echo $langs->trans('SecurityCode'); ?></label>
-			<input type="text" id="securitycode" name="securitycode" />
-			<div align="center"><img src="<?php echo $dol_url_root.'/core/antispamimage.php'; ?>" border="0" width="80" height="32" /></div>
-			<?php } ?>
-		</div>
-
-		<input type="submit" data-theme="b" value="<?php echo $langs->trans('SendByMail'); ?>" />
-
-		</form>
-
-	</div><!-- /content -->
-
-	<div data-role="footer" data-theme="b">
-		<?php if ($mode == 'dolibarr' || ! $disabled) {
-			echo $langs->trans('SendNewPasswordDesc');
-		}else{
-			echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode);
-		} ?>
-	</div>
-
-</div><!-- /page -->
-
-<?php if ($message) { ?>
-	<script type="text/javascript">
-		alert('<?php echo $message; ?>');
-	</script>
-<?php } ?>
-
-<!-- END SMARTPHONE TEMPLATE -->
-</body>
-</html>