diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index a217f34d939..16423f95359 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -214,7 +214,7 @@ $adresseadmin=$object->mail_admin; print $langs->trans("Title") .''; if ($action == 'edit') { - print ''; + print ''; } else print dol_htmlentities($object->titre); print ''; @@ -310,14 +310,26 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current $url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage; -$urllink=''.$url.''; +$urllink=''; print $urllink; +if ($action != 'edit') +{ + print ''; + print ' '.$langs->trans("Link").''; +} print ''; dol_fiche_end(); -if ($action == 'edit') print '
'; +if ($action == 'edit') +{ + print '
'; +} print ''."\n"; diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css index 7d7ef088c7e..7e359bd134e 100644 --- a/htdocs/opensurvey/css/style.css +++ b/htdocs/opensurvey/css/style.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2013 Laurent Destailleur +/* Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2012 Regis Houssin * Copyright (C) 2011 Philippe Grand @@ -51,6 +51,8 @@ background: #f78d1d; background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20)); background: -moz-linear-gradient(top, #faa51a, #f47a20); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20'); +margin-left: 4px; +margin-right: 4px; } .orange:active { color: #fcd3a5; @@ -73,6 +75,8 @@ background: #0095cd; background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5)); background: -moz-linear-gradient(top, #00adee, #0078a5); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); +margin-left: 4px; +margin-right: 4px; } .blue:active { color: #80bed6; diff --git a/htdocs/opensurvey/img/date.png b/htdocs/opensurvey/img/date.png index c847011e952..c5e8dbdac8a 100644 Binary files a/htdocs/opensurvey/img/date.png and b/htdocs/opensurvey/img/date.png differ diff --git a/htdocs/opensurvey/img/sondage2.png b/htdocs/opensurvey/img/sondage2.png index 8018ce99860..e027ce9ef37 100644 Binary files a/htdocs/opensurvey/img/sondage2.png and b/htdocs/opensurvey/img/sondage2.png differ diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php index 3c10c256742..9566231353f 100644 --- a/htdocs/opensurvey/wizard/index.php +++ b/htdocs/opensurvey/wizard/index.php @@ -48,8 +48,8 @@ print '
'; print '

'.$langs->trans("OrganizeYourMeetingEasily").'

'; print '
'; print '
'; -print '
'; -print '
'; +print '
'; +print '
'; print '
'; print '
'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 4b68d4c975c..ad36760b564 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -447,6 +447,7 @@ textarea.centpercent { /* Styles to hide objects */ /* ============================================================================== */ +.clearboth { clear:both; } .hideobject { display: none; } .minwidth100 { min-width: 100px; } .minwidth200 { min-width: 200px; } @@ -1359,8 +1360,6 @@ img.toolbarbutton { /* Onglets */ /* ============================================================================== */ div.tabs { -/* margin: 0px 0px 2px 6px; - padding: 0px 6px 3px 0px; */ text-align: ; margin-left: 6px !important; margin-right: 6px !important; @@ -3159,5 +3158,17 @@ border-top-right-radius: 6px; padding-left: 54px; } + +/* CSS style used for small screen */ + +.imgopensurveywizard +{ + padding: 0 4px 0 4px; +} +@media only screen and (max-width: 767px) +{ + .imgopensurveywizard { width:95%; height: auto; } +} + close();