WebSVN – eFlore/Applications.cel – Diff – /trunk/widget/modules/saisie2/squelettes/saisie.tpl.html

     <!-- Favicones -->
     <link rel="shortcut icon" type="image/x-icon" href="https://resources.tela-botanica.org/tb/img/16x16/favicon.ico" />
     <!-- CSS -->
-    <link href="https://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.18/css/smoothness/jquery-ui-1.8.18.custom.css" rel="stylesheet" type="text/css" media="screen" />
-    <!-- <link href="https://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.18/css/smoothness/jquery-ui-1.8.18.custom.css" rel="stylesheet" type="text/css" media="screen" /> -->
+    <link href="https://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.18/css/smoothness/jquery-ui-1.8.18.custom.css" rel="stylesheet" type="text/css" media="screen" />
      <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous" />
-    <!-- <link href="https://www.tela-botanica.org/commun/bootstrap/2.0.2/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen"> -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous" />
-    <link rel="stylesheet" type="text/css" href="<?= $url_base; ?>modules/saisie2/squelettes/css/bootstrap-4/css/bootstrap.min.css" />
-    <!-- <link rel="stylesheet" type="text/css" href="https://resources.tela-botanica.org/bootstrap/3.1.0/css/bootstrap.min.css"> -->
-    <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
+    <link rel="stylesheet" type="text/css" href="<?= $url_base; ?>modules/saisie2/squelettes/css/bootstrap-4/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous" />
-      <!-- <link id="telabotanica-style-css" rel="stylesheet" href="https://beta.tela-botanica.org/preprod/wp-content/themes/telabotanica/dist/bundle.css?ver=4.9.7" type="text/css" media="all"> -->
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous" />
     <link href="<?= $url_base; ?>modules/saisie2/squelettes/css/saisie.css" rel="stylesheet" type="text/css" media="screen" />
     <!--  Google Analytics -->
             <div id="tb-navigation" data-courant="widget-cel-saisie2" data-squelette="navigation" data-mode="test">
             <!-- dev (localhost) : -->
             <!-- <div id="tb-navigation" data-courant="widget-cel-saisie2" data-squelette="navigation" data-mode="local"> -->
               <div class="navbar-default mb-3" id="tb-navbar">
                 <div class="nav navbar-nav navbar-right row">
-                  <div id="bouton-connexion" class="dropdown col-md-6 col-sm-12">
+                  <div id="bouton-connexion" class="dropdown col-md-6 col-sm-8">
                     <label for="bouton-connexion">Je me connecte à mon compte : </label>
                     <a id="connexion" href="<?= $authTpl; ?>" class="btn btn-success  mr-1 mb-1" taget="_blank">Connexion</a>
                     <a id="bouton-inscription" href="https://beta.tela-botanica.org/test/inscription" class="btn btn-primary mr-1 mb-1" taget="_blank">Inscription</a>
                   </div>
-                  <div id="creation-compte" class="dropdown col-md-6 col-sm-12">
+                  <div id="creation-compte" class="dropdown col-md-6 col-sm-8">
                     <label for="creation-compte">Je ne souhaite pas m'inscrire : </label>
                     <a id="bouton-anonyme" href="#" class="btn btn-info mr-1 mb-1">Observation sans inscription</a>
                   </div>
                   <div id="utilisateur-connecte" class="dropdown hidden">
                     <label for="utilisateur-connecte">Bienvenue : </label>
                     <a href="#" class="list-tool btn btn-largee btn-primary dropdown-toggle" data-toggle="dropdown">
                       <span id="nom-complet"></span>
                     </a>
                     <div class="dropdown-menu">
                       <div id="profil-utilisateur"><a href="https://beta.tela-botanica.org/test/inscription" taget="_blank">Mon profil</a></div>
-                      <div id="deconnexion"><a href="https://beta.tela-botanica.org/widget:reseau:auth?action=deconnexion&origine=" taget="_blank">Déconnexion</a></div>
+                      <div id="deconnexion"><a href="#">Déconnexion</a></div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
             <div id="anonyme" class="mb-3 hidden">
               <label for="anonyme">Informations sur l'observateur : </label>
               <div id="zone-courriel" class="row">
                 <div class="control-group col-md-6">
-                  <label for="courriel" class="col-sm-12 obligatoire" title="<?= $observateur['courriel-title']; ?>">
+                  <label for="courriel" class="col-sm-8 obligatoire" title="<?= $observateur['courriel-title']; ?>">
                     <i class="fa fa-envelope" aria-hidden="true"></i>
                     <?= $observateur['courriel']; ?>
                   </label>
                   <div class="col-sm-8 mb-3">
                   </div>
                 </div>
                 <div id="zone-courriel-confirmation" class="control-group col-md-6 hidden">
-                  <label for="courriel_confirmation" class="col-sm-12 obligatoire" title="Veuillez confirmer le courriel.">
+                  <label for="courriel_confirmation" class="col-sm-8 obligatoire" title="Veuillez confirmer le courriel.">
                     <i class="fa fa-envelope" aria-hidden="true"></i>
                     Courriel (confirmation)
                   </label>
                 </div>
               </div>
               <div id="zone-prenom-nom" class="row hidden">
                 <div class="control-group col-md-6">
-                  <label for="prenom" class="col-sm-12">
+                  <label for="prenom" class="col-sm-8">
                     <i class="fa fa-user" aria-hidden="true"></i>
                     <?= $observateur['prenom']; ?>
                   </label>
                   <div class="input-group col-sm-8">
                     <input id="prenom" name="prenom" class="form-control" type="text">
                   </div>
                 </div>
                 <div class="control-group col-md-6">
-                  <label for="nom" class="col-sm-12">
+                  <label for="nom" class="col-sm-8">
                     <i class="fa fa-user" aria-hidden="true"></i>
                     <?= $observateur['nom']; ?>
           <form id="form-observation" role="form" autocomplete="on">
             <h2><?= $observation['titre']; ?></h2>
             <div id="zone-observation" class="row">
               <div class="col-md-6">
                 <div class="control-group">
-                  <label for="geolocalisation" class="col-sm-12 obligatoire" title="<?= $observateur['courriel-title']; ?>">
+                  <label for="geolocalisation" class="col-sm-8 obligatoire" title="<?= $observateur['courriel-title']; ?>">
                     <i class="fa fa-street-view" aria-hidden="true"></i>
                     <?= $observation['geolocalisation']; ?>
                   </label>
-                  <div class="col-sm-12 mb-3">
+                  <div class="col-sm-8 mb-3">
                     <input id="geolocalisation" name="geolocalisation" type="hidden">
                     <!-- code à décommenter pour avoir un aperçu de la carte qui fonctionne sous chrome,
                     à remplacer quand Stéphane aura fait une release sur https://github.com/steph-del/tb-geoloc-lib/releases -->
                     <!-- <app-root></app-root>
                     <script type="text/javascript" src="modules/saisie2/squelettes/js/runtime.js"></script>
                     <script type="text/javascript" src="modules/saisie2/squelettes/js/vendor.js"></script>
                     <script type="text/javascript" src="modules/saisie2/squelettes/js/main.js"></script> -->
                   </div>
                 </div>
                 <div class="control-group">
-                  <label for="milieu" class="col-sm-12">
+                  <label for="milieu" class="col-sm-8">
                     <i class="fa fa-street-view" aria-hidden="true"></i>
                     <?= $observation['milieu']; ?>
                   </label>
                   <div class="col-sm-8 mb-3">
                     <?php if ( 0 < count( (array) $widget['milieux'] ) ) :?>
                 </div>
               </div>
               <div class="col-md-6">
                 <div class="control-group">
-                  <label for="date_releve" class="col-sm-12 obligatoire" title="">
+                  <label for="date_releve" class="col-sm-8 obligatoire" title="">
                     <i class="fa fa-calendar" aria-hidden="true"></i>
                     <?= $observation['date']; ?>
                   </label>
                   <div class="col-sm-8 mb-3" id="datetimepicker">
                     <input type="text" id="date_releve" name="date_releve" class="form-control date" placeholder="jj/mm/aaaa"  pattern="(^(((0[1-9]|1[0-9]|2[0-8])[\/](0[1-9]|1[012]))|((29|30|31)[\/](0[13578]|1[02]))|((29|30)[\/](0[4,6,9]|11)))[\/](19|[2-9][0-9])\d\d$)|(^29[\/]02[\/](19|[2-9][0-9])(00|04|08|12|16|20|24|28|32|36|40|44|48|52|56|60|64|68|72|76|80|84|88|92|96)$)" title="jj/mm/aaaa">
                   </div>
                 </div>
                 <?php if( 'referentiel' === $widget['type_especes'] && '' === $widget['referentiel'] ) : ?>
                   <div class="control-group">
-                    <label for="referentiel" class="col-sm-12 obligatoire" title="">
+                    <label for="referentiel" class="col-sm-8 obligatoire" title="">
                       <i class="fa fa-book" aria-hidden="true"></i>
                       <?= $observation['referentiel']; ?>
                     </label>
                 <?php else : ?>
                   <input id="referentiel" name="referentiel" value="<?= $widget['referentiel']; ?>" type="hidden">
                 <?php endif; ?>
                 <div class="control-group">
-                  <label for="taxon" class="col-sm-12 obligatoire" title="">
+                  <label for="taxon" class="col-sm-8 obligatoire" title="">
                     <i class="fa fa-leaf" aria-hidden="true"></i>
                     <?= $observation['espece']; ?>
                   </label>
                   <div class="col-sm-8 mb-3">
                     <input id="taxon" name="taxon" class="form-control" type="text">
                   </div>
                 </div>
                 <div class="control-group">
-                  <label for="certitude" class="col-sm-12 obligatoire" title="">
+                  <label for="certitude" class="col-sm-8 obligatoire" title="">
                     <i class="fa fa-question" aria-hidden="true"></i>
                     <?= $observation['certitude']; ?>
                   </label>
                       $max         = ( $champ['fieldValues']['max'] )? ' max="' . $champ['fieldValues']['max'] . '"':'';
                       $step        = ( $champ['fieldValues']['step'] )? ' step="' . $champ['fieldValues']['step'] . '"':'';
                       $default     = ( $champ['fieldValues']['default'] )? ' value="' . $champ['fieldValues']['default'] . '"':'';
                       $description = ( $champ['description'] )? ' title="' . $champ['description'] . '"':'';
                       $placeholder = ( $champ['fieldValues']['placeholder'] )? ' placeholder="' . $champ['fieldValues']['placeholder'] . '"':'';
-                      $help        = ( $champ['help'] )? ' and-help':'';
                       $required    = '';
                       $mandatory   = '';
                       $datepicker  = '';
                       $pattern     = '';
                       $obs_radio   = '';
+                      $help        = '';
+                      $help_button = '';
+                      if( /*true*/$champ['help'] ) {
+                        $help = ' and-help';
+                        // TODO récupérer un $champ['help_mime_type']
+                        // $champ['help_mime_type'] = 'application/pdf';
+                        $champ['help_mime_type'] = 'image.*';
+                        $help_button = ' <div class="help-button help-' . $champ['key'] . ' btn btn-outline-info btn-sm border-0" data-key="' . $champ['key'] . '" data-name="' . $champ['name'] . '" data-mime-type="' . $champ['help_mime_type'] . '"><i class="fas fa-info-circle"></i></div>';
+                      }
                       if( $champ['mandatory'] ) {
                         // Attr required
                         $required  = ' required';
                       switch( $champ['element'] ) {
                         case 'radio':
                         case 'checkbox': ?>
                           <div class="control-group <?= $champ['element']; ?> mb-3"<?php echo $description . $required; ?>>
-                            <div class="col-sm-12 list-label<?php echo $help . $mandatory; ?>">
+                            <div class="col-sm-8 list-label<?php echo $help . $mandatory; ?>">
-                              <?= $champ['name']; ?>
+                              <?= $champ['name'] . $help_button; ?>
                             </div>
                             <div class="col-sm-8">
                                       <input type="<?= $champ['element']; ?>" id="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" name="<?= $champ['key']; ?>" value="<?= $list_value; ?>"<?= $checked; ?> class="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" data-label="<?= $champ['name']; ?>">
                                       <?= $list_value; ?>
                                     </label>
                                   <?php else : ?>
                                     <label for="other-<?= $champ['key']; ?>">
-                                      <input type="<?= $champ['element']; ?>" id="other-<?= $champ['key']; ?>"'name="<?= $champ['key']; ?>" value="other" class="other" data-label="<?= $champ['name']; ?>" data-element="<?= $champ['element']; ?>">
+                                      <input type="<?= $champ['element']; ?>" id="other-<?= $champ['key']; ?>" name="<?= $champ['key']; ?>" value="other" class="other" data-label="<?= $champ['name']; ?>" data-element="<?= $champ['element']; ?>">
                                       Autre
                                     </label>
                                   <?php endif; ?>
                           </div>
                         <?php break;
                         case 'list-checkbox': ?>
                           <div class="multiselect <?php echo $champ['element'] . $help; ?>">
-                            <label class="col-sm-12<?= $mandatory; ?>"><?= $champ['name']; ?></label>
+                            <label class="col-sm-8<?= $mandatory; ?>"><?= $champ['name'] . $help_button; ?></label>
                             <div class="control-group col-sm-8 mb-3">
                               <div class="selectBox">
                                 <select class="form-control" id="list-checkbox-<?= $champ['key']; ?>"<?php echo $description . $required; ?> class="form-control">
                                   <option>Plusieurs choix possibles</option>
                             </div>
                           </div>
                         <?php break;
                         case 'select': ?>
-                          <label for="<?= $champ['key']; ?>" class="col-sm-12<?= $mandatory; ?>"<?= $description; ?>><?= $champ['name']; ?></label>
+                          <label for="<?= $champ['key']; ?>" class="col-sm-8<?= $mandatory; ?>"<?= $description; ?>><?= $champ['name'] . $help_button; ?></label>
                           <div class="champ col-sm-8 mb-3">
                             <div class="select-wrapper add-field-select <?php echo $champ['element'] . $help; ?>">
                               <select name="<?= $champ['key']; ?>" id="<?= $champ['key']; ?>" class="<?= $champ['key']; ?> form-control"<?= $required; ?> data-label="<?= $champ['name']; ?>">
                             </div>
                           </div>
                         <?php break;
                         case 'file' : ?>
-                          <div class="control-group col-sm-12 mb-3">
+                          <div class="control-group col-sm-8 mb-3">
                             <div class="input-file-container<?= $help; ?>">
                               <input type="<?= $champ['element']; ?>" name="<?= $champ['key']; ?>" class="<?php echo $champ['key'] . ' input-file'; ?> form-control" <?php echo $description . $placeholder . $required; ?>  accept="application/pdf, image/*, video/*" data-label="<?= $champ['name']; ?>">
                               <label for="<?= $champ['key']; ?>" class="label-file<?= $mandatory; ?>" <?= $description; ?>><i class="fas fa-download" aria-hidden="true"></i> <?= $champ['name']; ?></label>
                           </div>
                         <?php break;
                         case 'textarea': ?>
                           <div class="control-group">
-                            <label for="<?= $champ['key']; ?>" class="col-sm-12<?php echo $help . $mandatory; ?>" <?= $description; ?>><?= $champ['name']; ?></label>
+                            <label for="<?= $champ['key']; ?>" class="col-sm-8<?php echo $help . $mandatory; ?>" <?= $description; ?>><?= $champ['name'] . $help_button; ?></label>
                             <div class="col-sm-8 mb-3">
                               <textarea type="<?= $champ['element']; ?>" id="<?= $champ['key']; ?>" name="<?= $champ['key']; ?>" class="<?= $champ['key'] . $help; ?> form-control" <?php echo $description . $placeholder . $required; ?> data-label="<?= $champ['name']; ?>"></textarea>
                             </div>
                           </div>
                         <?php break;
                         case 'range': ?>
                           <div class="control-group">
-                            <label for="<?= $champ['key']; ?>" class="col-sm-12<?= $help . $mandatory; ?>" <?= $description; ?>><?= $champ['name']; ?></label>
+                            <label for="<?= $champ['key']; ?>" class="col-sm-8<?= $help . $mandatory; ?>" <?= $description; ?>><?= $champ['name'] . $help_button; ?></label>
                             <div class="col-sm-8 mb-3">
                               <input type="<?= $champ['element']; ?>" name="<?= $champ['key']; ?>" class="<?= $champ['key'] . $help; ?> form-control" <?php echo $description . $placeholder . $step . $default . $min . $max . $required; ?> data-label="<?= $champ['name']; ?>">
                             </div>
                           </div>
                           <?php break;
                         case 'number':
                         case 'date': ?>
                           <div class="control-group">
-                            <label for="<?= $champ['key']; ?>" class="col-sm-12<?php echo $datepicker . $mandatory; ?>" <?= $description; ?>><?= $champ['name']; ?></label>
+                            <label for="<?= $champ['key']; ?>" class="col-sm-8<?php echo $datepicker . $mandatory; ?>" <?= $description; ?>><?= $champ['name'] . $help_button; ?></label>
                             <div class="col-sm-8 mb-3">
                               <input type="<?= $champ['element']; ?>" name="<?= $champ['key']; ?>" class="<?= $champ['key'] . $help . $datepicker; ?> form-control"<?php echo  $pattern . $description . $placeholder . $step . $default . $min . $max . $required; ?> data-label="<?= $champ['name']; ?>">
                             </div>
                           </div>
                           <?php break;
                         case 'text' :
                         case 'email':
                         default: ?>
                           <div class="control-group">
-                            <label for="<?= $champ['key']; ?>" class="col-sm-12<?= $mandatory; ?>" <?= $description; ?>><?= $champ['name']; ?></label>
+                            <label for="<?= $champ['key']; ?>" class="col-sm-8<?= $mandatory; ?>" <?= $description; ?>><?= $champ['name'] . $help_button; ?></label>
                             <div class="col-sm-8 mb-3">
             </a>
           </div>
         </footer>
       </div>
     </div>
+    <div id="help-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="help-modal-label" style="display: none;" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="help-modal-label"></h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body" id="print_content"></div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">Fermer</button>
+          </div>
+        </div>
+      </div>
+    </div>
     <!-- Jquery -->
-    <script type="text/javascript" src="https://code.jquery.com/jquery-1.12.1.js"></script>
+    <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/1.11.1/jquery-1.11.1.min.js"></script>
     <!-- Jquery UI : nécessaire pour le minicalendrier et l'auto-complétion -->
     <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/jquery-ui/1.11.0/js/jquery-ui.min.js"></script>
     <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/jquery-ui/1.11.0/js/datepicker-fr.js"></script>
     <!-- Jquery Plugins -->
     <!-- Jquery Validate : nécessaire pour la validation des formulaires -->
-    <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/validate/1.11.1/jquery.validate.min.js"></script>
-    <!-- <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/validate/1.11.1/jquery.validate-patched.min.js"></script> -->
+    <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/validate/1.11.1/jquery.validate.min.js"></script>
     <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/validate/1.11.1/additional-methods.min.js"></script>
     <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/validate/1.11.1/messages_fr.js"></script>
     <!-- Jquery Form :nécessaire pour l'upload des images -->
     <script type="text/javascript" src="https://resources.tela-botanica.org/jquery/form/3.51/jquery.form.min.js"></script>
-    <!-- Bootstrap -->
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script> -->
+    <!-- Bootstrap -->
-    <!-- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script> -->
-    <script type="text/javascript" src="https://resources.tela-botanica.org/bootstrap/2.3.2/js/bootstrap.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
     <!-- Authentification -->
     <script type="text/javascript" src="<?= $url_base; ?>modules/saisie2/squelettes/js/auth.js"></script>
     <!-- Connexion, bloc de prévisualisation, date -->
     <script type="text/javascript" src="<?= $url_base; ?>modules/saisie2/squelettes/js/WidgetSaisie.js"></script>

Subversion Repositories eFlore/Applications.cel

(root)/trunk/widget/modules/saisie2/squelettes/saisie.tpl.html – Rev 3213 → 3217