diff --git a/htdocs/includes/iphone/iwebkit/Framework/css/developer-style.css b/htdocs/includes/iwebkit/Framework/css/developer-style.css similarity index 100% rename from htdocs/includes/iphone/iwebkit/Framework/css/developer-style.css rename to htdocs/includes/iwebkit/Framework/css/developer-style.css diff --git a/htdocs/includes/iphone/iwebkit/Framework/css/style.css b/htdocs/includes/iwebkit/Framework/css/style.css similarity index 100% rename from htdocs/includes/iphone/iwebkit/Framework/css/style.css rename to htdocs/includes/iwebkit/Framework/css/style.css diff --git a/htdocs/includes/iphone/iwebkit/Framework/index.html b/htdocs/includes/iwebkit/Framework/index.html similarity index 100% rename from htdocs/includes/iphone/iwebkit/Framework/index.html rename to htdocs/includes/iwebkit/Framework/index.html diff --git a/htdocs/includes/iphone/iwebkit/Framework/javascript/developer-functions.js b/htdocs/includes/iwebkit/Framework/javascript/developer-functions.js similarity index 100% rename from htdocs/includes/iphone/iwebkit/Framework/javascript/developer-functions.js rename to htdocs/includes/iwebkit/Framework/javascript/developer-functions.js diff --git a/htdocs/includes/iphone/iwebkit/Framework/javascript/functions.js b/htdocs/includes/iwebkit/Framework/javascript/functions.js similarity index 100% rename from htdocs/includes/iphone/iwebkit/Framework/javascript/functions.js rename to htdocs/includes/iwebkit/Framework/javascript/functions.js diff --git a/htdocs/includes/iphone/iwebkit/Userguide.pdf b/htdocs/includes/iwebkit/Userguide.pdf similarity index 100% rename from htdocs/includes/iphone/iwebkit/Userguide.pdf rename to htdocs/includes/iwebkit/Userguide.pdf diff --git a/htdocs/includes/iphone/iwebkit/changelog.pdf b/htdocs/includes/iwebkit/changelog.pdf similarity index 100% rename from htdocs/includes/iphone/iwebkit/changelog.pdf rename to htdocs/includes/iwebkit/changelog.pdf diff --git a/htdocs/includes/iphone/iwebkit/license.pdf b/htdocs/includes/iwebkit/license.pdf similarity index 100% rename from htdocs/includes/iphone/iwebkit/license.pdf rename to htdocs/includes/iwebkit/license.pdf diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index c575a7b001b..02eb19d76ca 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -54,12 +54,19 @@ function dol_loginfunction($langs,$conf,$mysoc) // Select templates if ($conf->browser->phone) { - // Special cases - if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone)) + // iWebKit template + if (preg_match('/android|blackberry|iphone/i',$conf->browser->phone)) + { + $theme = 'default'; + $template_dir=DOL_DOCUMENT_ROOT."/theme/phones/smartphone/tpl/"; + } + // Special template + elseif (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone)) { $theme = 'default'; $template_dir=DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/"; } + // Default template else { $template_dir=DOL_DOCUMENT_ROOT."/theme/phones/others/tpl/"; diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 3f80fcb4424..153ec2f92b6 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -1,10 +1,10 @@ * Copyright (C) 2003 Xavier Dutoit - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2005 Simon Tosser * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010 Juanjo Menent diff --git a/htdocs/theme/phones/iphone/AUTHOR b/htdocs/theme/phones/iphone/AUTHOR deleted file mode 100644 index eb91065849d..00000000000 --- a/htdocs/theme/phones/iphone/AUTHOR +++ /dev/null @@ -1 +0,0 @@ -2009 Regis Houssin diff --git a/htdocs/theme/phones/smartphone/AUTHOR b/htdocs/theme/phones/smartphone/AUTHOR new file mode 100644 index 00000000000..1224ebffbda --- /dev/null +++ b/htdocs/theme/phones/smartphone/AUTHOR @@ -0,0 +1 @@ +2009-2010 Regis Houssin diff --git a/htdocs/theme/phones/iphone/index.php b/htdocs/theme/phones/smartphone/index.php similarity index 100% rename from htdocs/theme/phones/iphone/index.php rename to htdocs/theme/phones/smartphone/index.php diff --git a/htdocs/theme/phones/iphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php similarity index 86% rename from htdocs/theme/phones/iphone/theme/default/default.css.php rename to htdocs/theme/phones/smartphone/theme/default/default.css.php index bf3bd3bc313..3ef068d703a 100644 --- a/htdocs/theme/phones/iphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -17,8 +17,8 @@ */ /** - * \file htdocs/theme/phones/iphone/theme/default/default.css.php - * \brief Fichier de style CSS du theme Iphone default + * \file htdocs/theme/phones/smartphone/theme/default/default.css.php + * \brief Fichier de style CSS du theme Smartphone default * \version $Id$ */ @@ -323,7 +323,7 @@ a:hover .arrow { } #tributton .links, #duobutton .links { height: 30px; - -webkit-border-image: url("") 0 4 0 4; + -webkit-border-image: url("") 0 4 0 4; border-width: 0 4px 0 4px; margin: 0 auto 0px auto; position: relative; @@ -365,7 +365,7 @@ a:hover .arrow { text-shadow: black 0 -1px 0; } #triselectionbuttons, #duoselectionbuttons { - -webkit-border-image: url('') 0 5 0 5; + -webkit-border-image: url('') 0 5 0 5; border-width: 0 5px 0 5px; position: relative; margin: auto; @@ -434,7 +434,7 @@ li#doublead:hover { } .searchbox form { height: 24px; - -webkit-border-image: url('') 4 14 1 24; + -webkit-border-image: url('') 4 14 1 24; border-width: 4px 14px 1px 24px; display: block; position: relative; @@ -550,7 +550,7 @@ fieldset { right: 10px; top: 15px; margin: 0!important; - background: url("") 0 0 no-repeat; + background: url("") 0 0 no-repeat; } .applist .arrow { position: absolute; @@ -559,7 +559,7 @@ fieldset { right: 10px; top: 29px; margin: 0!important; - background: url("") 0 0 no-repeat; + background: url("") 0 0 no-repeat; } .store { height: 90px; @@ -663,22 +663,22 @@ li:last-child.store .image, .store:last-child a { display: block!important; } .store .stars0 { - background: url(''); + background: url(''); } .store .stars1 { - background: url(''); + background: url(''); } .store .stars2 { - background: url(''); + background: url(''); } .store .stars3 { - background: url(''); + background: url(''); } .store .stars4 { - background: url(''); + background: url(''); } .store .stars5, .applist .stars5 { - background: url(''); + background: url(''); } .applist .stars0, .applist .stars1, .applist .stars2, .applist .stars3, .applist .stars4, .applist .stars5 { position: absolute; @@ -689,19 +689,19 @@ li:last-child.store .image, .store:last-child a { display: block!important; } .applist .stars0 { - background: url(''); + background: url(''); } .applist .stars1 { - background: url(''); + background: url(''); } .applist .stars2 { - background: url(''); + background: url(''); } .applist .stars3 { - background: url(''); + background: url(''); } .applist .stars4 { - background: url(''); + background: url(''); } .applist .starcomment { left: 147px; @@ -861,10 +861,10 @@ li:last-child.store .image, .store:last-child a { margin-top: 16px; } .ipodlist .play { - background: url('') no-repeat; + background: url('') no-repeat; } .ipodlist a:hover .auto, .ipodlist a:hover .play { - background: url('') no-repeat; + background: url('') no-repeat; background-position: 0 -10px; } .ipodlist .time { @@ -989,23 +989,23 @@ li:last-child.store .image, .store:last-child a { text-decoration: none; } .black #leftnav a:first-child, .transparent #leftnav a:first-child { - -webkit-border-image: url("") 0 5 0 13; + -webkit-border-image: url("") 0 5 0 13; } .black #leftnav a, .transparent #leftnav a { - -webkit-border-image: url("") 0 5 0 13; + -webkit-border-image: url("") 0 5 0 13; } .black #rightnav a:first-child, .transparent #rightnav a:first-child { - -webkit-border-image: url("") 0 13 0 5; + -webkit-border-image: url("") 0 13 0 5; } .black #rightnav a, .transparent #rightnav a { - -webkit-border-image: url("") 0 13 0 5; + -webkit-border-image: url("") 0 13 0 5; } .black #leftbutton a, .black #rightbutton a, .transparent #leftbutton a, .transparent #rightbutton a { - -webkit-border-image: url("") 0 5 0 5; + -webkit-border-image: url("") 0 5 0 5; } #leftnav a:first-child { z-index: 2; - -webkit-border-image: url("") 0 5 0 13; + -webkit-border-image: url("") 0 5 0 13; border-width: 0 5px 0 13px; -webkit-border-top-left-radius: 16px; -webkit-border-bottom-left-radius: 16px; @@ -1014,7 +1014,7 @@ li:last-child.store .image, .store:last-child a { width: auto; } #leftnav a { - -webkit-border-image: url("") 0 5 0 13; + -webkit-border-image: url("") 0 5 0 13; z-index: 3; margin-left: -4px; border-width: 0 5px 0 13px; @@ -1032,7 +1032,7 @@ li:last-child.store .image, .store:last-child a { font-weight: bold; } #rightnav a { - -webkit-border-image: url("") 0 13 0 5; + -webkit-border-image: url("") 0 13 0 5; z-index: 3; margin-right: -4px; border-width: 0 13px 0 5px; @@ -1047,25 +1047,25 @@ li:last-child.store .image, .store:last-child a { z-index: 2; -webkit-border-top-left-radius: 6px; -webkit-border-bottom-left-radius: 6px; - -webkit-border-image: url("") 0 13 0 5; + -webkit-border-image: url("") 0 13 0 5; border-width: 0 13px 0 5px; -webkit-border-top-right-radius: 16px; -webkit-border-bottom-right-radius: 16px; } #leftbutton a, #rightbutton a { - -webkit-border-image: url("") 0 5 0 5; + -webkit-border-image: url("") 0 5 0 5; border-width: 0 5px; -webkit-border-radius: 6px; } #blueleftbutton a, #bluerightbutton a { - -webkit-border-image: url("") 0 5 0 5; + -webkit-border-image: url("") 0 5 0 5; border-width: 0 5px; -webkit-border-radius: 6px; } input[type="checkbox"] { width: 94px; height: 27px; - background: url(''); + background: url(''); -webkit-appearance: none; border: 0; float: right; @@ -1086,7 +1086,7 @@ input[type="radio"] { -webkit-border-radius: 0; } input[type="radio"]:checked { - background: url('') no-repeat; + background: url('') no-repeat; background-position: right center; } .radiobutton .name { @@ -1108,7 +1108,7 @@ select { max-width: 90%; } .select .arrow { - background: url(''); + background: url(''); width: 8px; height: 13px; display: block; diff --git a/htdocs/theme/phones/iphone/theme/default/img/0stars.png b/htdocs/theme/phones/smartphone/theme/default/img/0stars.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/0stars.png rename to htdocs/theme/phones/smartphone/theme/default/img/0stars.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/0starsborder.png b/htdocs/theme/phones/smartphone/theme/default/img/0starsborder.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/0starsborder.png rename to htdocs/theme/phones/smartphone/theme/default/img/0starsborder.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/1stars.png b/htdocs/theme/phones/smartphone/theme/default/img/1stars.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/1stars.png rename to htdocs/theme/phones/smartphone/theme/default/img/1stars.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/1starsborder.png b/htdocs/theme/phones/smartphone/theme/default/img/1starsborder.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/1starsborder.png rename to htdocs/theme/phones/smartphone/theme/default/img/1starsborder.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/2stars.png b/htdocs/theme/phones/smartphone/theme/default/img/2stars.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/2stars.png rename to htdocs/theme/phones/smartphone/theme/default/img/2stars.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/2starsborder.png b/htdocs/theme/phones/smartphone/theme/default/img/2starsborder.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/2starsborder.png rename to htdocs/theme/phones/smartphone/theme/default/img/2starsborder.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/3stars.png b/htdocs/theme/phones/smartphone/theme/default/img/3stars.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/3stars.png rename to htdocs/theme/phones/smartphone/theme/default/img/3stars.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/3starsborder.png b/htdocs/theme/phones/smartphone/theme/default/img/3starsborder.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/3starsborder.png rename to htdocs/theme/phones/smartphone/theme/default/img/3starsborder.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/4stars.png b/htdocs/theme/phones/smartphone/theme/default/img/4stars.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/4stars.png rename to htdocs/theme/phones/smartphone/theme/default/img/4stars.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/4starsborder.png b/htdocs/theme/phones/smartphone/theme/default/img/4starsborder.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/4starsborder.png rename to htdocs/theme/phones/smartphone/theme/default/img/4starsborder.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/5stars.png b/htdocs/theme/phones/smartphone/theme/default/img/5stars.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/5stars.png rename to htdocs/theme/phones/smartphone/theme/default/img/5stars.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/arrow.png b/htdocs/theme/phones/smartphone/theme/default/img/arrow.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/arrow.png rename to htdocs/theme/phones/smartphone/theme/default/img/arrow.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/background.png b/htdocs/theme/phones/smartphone/theme/default/img/background.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/background.png rename to htdocs/theme/phones/smartphone/theme/default/img/background.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/bluebutton.png b/htdocs/theme/phones/smartphone/theme/default/img/bluebutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/bluebutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/bluebutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/check.png b/htdocs/theme/phones/smartphone/theme/default/img/check.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/check.png rename to htdocs/theme/phones/smartphone/theme/default/img/check.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/checkbox.png b/htdocs/theme/phones/smartphone/theme/default/img/checkbox.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/checkbox.png rename to htdocs/theme/phones/smartphone/theme/default/img/checkbox.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/darkredbutton.png b/htdocs/theme/phones/smartphone/theme/default/img/darkredbutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/darkredbutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/darkredbutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/graybutton.png b/htdocs/theme/phones/smartphone/theme/default/img/graybutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/graybutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/graybutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/header.png b/htdocs/theme/phones/smartphone/theme/default/img/header.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/header.png rename to htdocs/theme/phones/smartphone/theme/default/img/header.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/home.png b/htdocs/theme/phones/smartphone/theme/default/img/home.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/home.png rename to htdocs/theme/phones/smartphone/theme/default/img/home.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/listheader.gif b/htdocs/theme/phones/smartphone/theme/default/img/listheader.gif similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/listheader.gif rename to htdocs/theme/phones/smartphone/theme/default/img/listheader.gif diff --git a/htdocs/theme/phones/iphone/theme/default/img/menutouched.png b/htdocs/theme/phones/smartphone/theme/default/img/menutouched.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/menutouched.png rename to htdocs/theme/phones/smartphone/theme/default/img/menutouched.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/more.png b/htdocs/theme/phones/smartphone/theme/default/img/more.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/more.png rename to htdocs/theme/phones/smartphone/theme/default/img/more.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/musiclistbg.png b/htdocs/theme/phones/smartphone/theme/default/img/musiclistbg.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/musiclistbg.png rename to htdocs/theme/phones/smartphone/theme/default/img/musiclistbg.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navbutton.png b/htdocs/theme/phones/smartphone/theme/default/img/navbutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navbutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/navbutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navbuttonblack.png b/htdocs/theme/phones/smartphone/theme/default/img/navbuttonblack.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navbuttonblack.png rename to htdocs/theme/phones/smartphone/theme/default/img/navbuttonblack.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navbuttonblue.png b/htdocs/theme/phones/smartphone/theme/default/img/navbuttonblue.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navbuttonblue.png rename to htdocs/theme/phones/smartphone/theme/default/img/navbuttonblue.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navleft.png b/htdocs/theme/phones/smartphone/theme/default/img/navleft.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navleft.png rename to htdocs/theme/phones/smartphone/theme/default/img/navleft.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navleftblack.png b/htdocs/theme/phones/smartphone/theme/default/img/navleftblack.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navleftblack.png rename to htdocs/theme/phones/smartphone/theme/default/img/navleftblack.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navlinkleft.png b/htdocs/theme/phones/smartphone/theme/default/img/navlinkleft.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navlinkleft.png rename to htdocs/theme/phones/smartphone/theme/default/img/navlinkleft.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navlinkleftblack.png b/htdocs/theme/phones/smartphone/theme/default/img/navlinkleftblack.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navlinkleftblack.png rename to htdocs/theme/phones/smartphone/theme/default/img/navlinkleftblack.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navlinkright.png b/htdocs/theme/phones/smartphone/theme/default/img/navlinkright.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navlinkright.png rename to htdocs/theme/phones/smartphone/theme/default/img/navlinkright.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navlinkrightblack.png b/htdocs/theme/phones/smartphone/theme/default/img/navlinkrightblack.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navlinkrightblack.png rename to htdocs/theme/phones/smartphone/theme/default/img/navlinkrightblack.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navright.png b/htdocs/theme/phones/smartphone/theme/default/img/navright.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navright.png rename to htdocs/theme/phones/smartphone/theme/default/img/navright.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/navrightblack.png b/htdocs/theme/phones/smartphone/theme/default/img/navrightblack.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/navrightblack.png rename to htdocs/theme/phones/smartphone/theme/default/img/navrightblack.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/play.gif b/htdocs/theme/phones/smartphone/theme/default/img/play.gif similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/play.gif rename to htdocs/theme/phones/smartphone/theme/default/img/play.gif diff --git a/htdocs/theme/phones/iphone/theme/default/img/popup-bg.png b/htdocs/theme/phones/smartphone/theme/default/img/popup-bg.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/popup-bg.png rename to htdocs/theme/phones/smartphone/theme/default/img/popup-bg.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/radiobutton.png b/htdocs/theme/phones/smartphone/theme/default/img/radiobutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/radiobutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/radiobutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/redbutton.png b/htdocs/theme/phones/smartphone/theme/default/img/redbutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/redbutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/redbutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/roundarrow.png b/htdocs/theme/phones/smartphone/theme/default/img/roundarrow.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/roundarrow.png rename to htdocs/theme/phones/smartphone/theme/default/img/roundarrow.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/searchfield.png b/htdocs/theme/phones/smartphone/theme/default/img/searchfield.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/searchfield.png rename to htdocs/theme/phones/smartphone/theme/default/img/searchfield.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/storebg.png b/htdocs/theme/phones/smartphone/theme/default/img/storebg.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/storebg.png rename to htdocs/theme/phones/smartphone/theme/default/img/storebg.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/storebgblank.png b/htdocs/theme/phones/smartphone/theme/default/img/storebgblank.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/storebgblank.png rename to htdocs/theme/phones/smartphone/theme/default/img/storebgblank.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/storetouched.png b/htdocs/theme/phones/smartphone/theme/default/img/storetouched.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/storetouched.png rename to htdocs/theme/phones/smartphone/theme/default/img/storetouched.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/textfield.png b/htdocs/theme/phones/smartphone/theme/default/img/textfield.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/textfield.png rename to htdocs/theme/phones/smartphone/theme/default/img/textfield.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/tools.png b/htdocs/theme/phones/smartphone/theme/default/img/tools.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/tools.png rename to htdocs/theme/phones/smartphone/theme/default/img/tools.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/tributton.png b/htdocs/theme/phones/smartphone/theme/default/img/tributton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/tributton.png rename to htdocs/theme/phones/smartphone/theme/default/img/tributton.png diff --git a/htdocs/theme/phones/iphone/theme/default/img/whitebutton.png b/htdocs/theme/phones/smartphone/theme/default/img/whitebutton.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/img/whitebutton.png rename to htdocs/theme/phones/smartphone/theme/default/img/whitebutton.png diff --git a/htdocs/theme/phones/iphone/theme/default/index.php b/htdocs/theme/phones/smartphone/theme/default/index.php similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/index.php rename to htdocs/theme/phones/smartphone/theme/default/index.php diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/accessibility.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/accessibility.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/accessibility.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/accessibility.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/appstore.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/appstore.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/appstore.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/appstore.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/basics.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/basics.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/basics.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/basics.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/calculator.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/calculator.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/calculator.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/calculator.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/calendar.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/calendar.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/calendar.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/calendar.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/calendar2.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/calendar2.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/calendar2.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/calendar2.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/camera.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/camera.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/camera.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/camera.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/clock.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/clock.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/clock.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/clock.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/compass.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/compass.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/compass.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/compass.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/contacts.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/contacts.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/contacts.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/contacts.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/dolibarr.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/dolibarr.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/dolibarr.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/dolibarr.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/help.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/help.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/help.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/help.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/homescreen.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/homescreen.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/homescreen.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/homescreen.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/ipod.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/ipod.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/ipod.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/ipod.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/itunes.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/itunes.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/itunes.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/itunes.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/mail.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/mail.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/mail.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/mail.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/maps.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/maps.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/maps.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/maps.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/messages.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/messages.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/messages.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/messages.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/music.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/music.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/music.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/music.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/nike+.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/nike+.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/nike+.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/nike+.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/notepad.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/notepad.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/notepad.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/notepad.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/other.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/other.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/other.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/other.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/otherapps.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/otherapps.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/otherapps.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/otherapps.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/photos.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/photos.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/photos.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/photos.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/plugin.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/plugin.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/plugin.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/plugin.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/safari.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/safari.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/safari.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/safari.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/settings.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/settings.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/settings.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/settings.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/sketches.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/sketches.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/sketches.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/sketches.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/sms.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/sms.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/sms.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/sms.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/start.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/start.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/start.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/start.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/stocks.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/stocks.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/stocks.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/stocks.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/support.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/support.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/support.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/support.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/telephone.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/telephone.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/telephone.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/telephone.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/tools.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/tools.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/tools.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/tools.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/video.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/video.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/video.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/video.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/voice.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/voice.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/voice.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/voice.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/weather.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/weather.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/weather.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/weather.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/wordpress.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/wordpress.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/wordpress.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/wordpress.png diff --git a/htdocs/theme/phones/iphone/theme/default/thumbs/youtube.png b/htdocs/theme/phones/smartphone/theme/default/thumbs/youtube.png similarity index 100% rename from htdocs/theme/phones/iphone/theme/default/thumbs/youtube.png rename to htdocs/theme/phones/smartphone/theme/default/thumbs/youtube.png diff --git a/htdocs/theme/phones/iphone/tpl/index.php b/htdocs/theme/phones/smartphone/tpl/index.php similarity index 100% rename from htdocs/theme/phones/iphone/tpl/index.php rename to htdocs/theme/phones/smartphone/tpl/index.php diff --git a/htdocs/theme/phones/iphone/tpl/login.tpl.php b/htdocs/theme/phones/smartphone/tpl/login.tpl.php similarity index 90% rename from htdocs/theme/phones/iphone/tpl/login.tpl.php rename to htdocs/theme/phones/smartphone/tpl/login.tpl.php index 711ca7f3ad9..2a3ff72d288 100644 --- a/htdocs/theme/phones/iphone/tpl/login.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/login.tpl.php @@ -32,10 +32,10 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client); <?php echo $title; ?> - + - - + + @@ -50,7 +50,7 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
- +

@@ -102,7 +102,7 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
  • - tools + tools trans('PasswordForgotten'); ?> @@ -112,7 +112,7 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
  • - support + support trans('NeedHelpCenter'); ?> diff --git a/htdocs/theme/phones/iphone/tpl/passwordforgotten.tpl.php b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php similarity index 92% rename from htdocs/theme/phones/iphone/tpl/passwordforgotten.tpl.php rename to htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php index d155544d826..6259adf49f4 100644 --- a/htdocs/theme/phones/iphone/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php @@ -33,8 +33,8 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client); - - + + @@ -43,7 +43,7 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
    trans('Password'); ?>
    @@ -54,7 +54,7 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
    - +

    diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index af48edd5641..f5e8daaba7d 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -1,5 +1,6 @@ + * Copyright (C) 2008-2010 Regis Houssin * * 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 @@ -145,11 +146,19 @@ $dol_url_root = DOL_URL_ROOT; // Select templates if ($conf->browser->phone) { - if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone)) + // iWebKit template + if (preg_match('/android|blackberry|iphone/i',$conf->browser->phone)) + { + $theme = 'default'; + $template_dir=DOL_DOCUMENT_ROOT."/theme/phones/smartphone/tpl/"; + } + // Special phones templates + elseif (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone)) { $theme = 'default'; $template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/"; } + // Default phones template else { $template_dir = DOL_DOCUMENT_ROOT."/theme/phones/others/tpl/";