phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change col-xs to col-sm : tablet

Browse Source
This commit is contained in:
Phuoc
2019-01-28 15:04:42 +01:00
parent 3f113dbd49
commit 30f5084f02
11 changed files with 110 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mondumas/static/css/style.less
View File

@@ -1,6 +1,51 @@
/* style.less */
@error: #b94a48;
/* ajout pour Nicola */
@media (max-width: 992px) {
.navbar-header {
float: none;
}
.navbar-left,.navbar-right {
float: none !important;
}
.navbar-toggle {
display: block;
}
.navbar-collapse {
border-top: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
}
.navbar-fixed-top {
top: 0;
border-width: 0 0 1px;
}
.navbar-collapse.collapse {
display: none!important;
}
.navbar-nav {
float: none!important;
margin-top: 7.5px;
}
.navbar-nav>li {
float: none;
}
.navbar-nav>li>a {
padding-top: 10px;
padding-bottom: 10px;
}
.collapse.in{
display:block !important;
}
}
/* ne pas affichier l'url after the link */
@media print {
a[href]:after {
content: none !important;
}
}
.navbar {
margin-bottom: 0;
background-color: #fe9900;
@@ -46,12 +91,9 @@
color: #000000 !important;
}
/* push modal dialog down the viewport */
.modal-dialog {
position: absolute;
margin-left: 200px;
height: 500px;
top: 80px;
top:7%;
}
#footer {

12
mondumas/templates/agenda/agenda.pt
View File

@@ -7,15 +7,15 @@
<div class="row">
<form method="POST" id="frm" class="form-horizontal">
<div class="form-group">
<div class="col-md-4">
<div class="col-sm-4">
<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()">
<div tal:repeat="item agendas">
<option value="${item.CD_UTI}" tal:attributes="selected agenda==item.CD_UTI and 'selected' or None">${item.NOM}</option>
</div>
</select>
</div>
<label class="control-label col-md-2">Dossier en cours :</label>
<div class="col-md-6">
<label class="control-label col-sm-2">Dossier en cours :</label>
<div class="col-sm-6">
<div class="input-group">
<input class="form-control" type="text" name="dossier" value="${mem_nodossier}&nbsp;&nbsp;|&nbsp;&nbsp;${mem_nomdossier}" readonly />
<div class="input-group-btn">
@@ -60,7 +60,7 @@
Voulez-vous créer un rendez-vous avec : <br />
</p>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-8">
<div class="col-sm-offset-2 col-sm-8">
<p class="text-danger"><b>${mem_nodossier} - ${mem_nomdossier}</p>
<p>le <span id=dateheureRDV>date</p>
</div>
@@ -68,7 +68,7 @@
<input type="hidden" name="dateRDV" id=dateRDV value="date">
<input type="hidden" name="heureRDV" id=heureRDV value="heure">
<div class="form-group">
<div class="col-xs-offset-2 col-xs-8">
<div class="col-sm-offset-2 col-sm-10">
<label>Motif :</label>
<select class="form-control" id="type_rdv" name="type_rdv">
<div tal:repeat="item types_rdv">
@@ -79,7 +79,7 @@
</div>
<div class="form-group">
<div class="col-xs-5 col-xs-offset-4">
<div class="col-sm-5 col-sm-offset-4">
<button type="submit" class="btn btn-danger" name="form.submitted"
tal:condition="mem_nodossier != 'Aucun'">Créer</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>

18
mondumas/templates/agenda/rdv_edit.pt
View File

@@ -11,14 +11,14 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="control-label col-xs-2">No dossier</label>
<div class="col-xs-9">
<label class="control-label col-sm-3">No dossier</label>
<div class="col-sm-9">
<span class="form-control-static text-danger">${nodossier}&nbsp;&nbsp;|&nbsp;&nbsp;${rdv.C_QUALITE} ${rdv.C_NOM}</span>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="date_rdv_picker">Date et heure</label>
<div class="col-xs-3 input-group date" id="date_rdv_picker">
<label class="control-label col-sm-3" for="date_rdv_picker">Date et heure</label>
<div class="col-sm-9 input-group date" id="date_rdv_picker">
<input class="form-control" type="text" name="rdv_debut" value="${rdv.rdv_debut.strftime('%d-%m-%Y %H:%M')}"
data-fv-notempty="true"
data-fv-notempty-message="La date et l'heure sont obligatoires"
@@ -32,8 +32,8 @@
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="COMMENT">Commentaire</label>
<div class="col-xs-10">
<label class="control-label col-sm-3" for="COMMENT">Commentaire</label>
<div class="col-sm-9">
<input class="form-control" type="text" id=".COMMENT" name="COMMENT" value="${rdv.COMMENT}"
placeholder="65 caractères maximum"
data-fv-notempty="true"
@@ -45,13 +45,13 @@
</div>
<div class="form-group">
<label class="control-label col-xs-2">Dern. modif le</label>
<div class="col-xs-9">
<label class="control-label col-sm-3">Dern. modif le</label>
<div class="col-sm-9">
<p class="form-control-static">${rdv.DATEMAJ.strftime('%d-%m-%Y %H:%M')} par ${rdv.USERMAJ}</p>
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-10">
<div class="col-sm-offset-3 col-sm-9">
<div class="form-group">
<a class="btn btn-default" href="/agenda/${rdv.rdv_debut.strftime('%Y-%m-%d')}">
<span class="glyphicon glyphicon-arrow-left"></span> Annuler</a>

2
mondumas/templates/default/changer_mdp.pt
View File

@@ -4,7 +4,6 @@
<div tal:condition="message" tal:content="message" class="alert alert-danger" />
<div class="row">
<div class="col-xs-3">
<form id="change-password-form" action="${url}" method="post" tal:condition="member"
data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok"
@@ -41,7 +40,6 @@
<button class="btn btn-primary" type="submit" name="form.submitted">Changer le mot de passe</button>
</div>
</form>
</div>
</div> <!-- row -->
<script>

5
mondumas/templates/default/envoyer_mdp.pt
View File

@@ -7,8 +7,9 @@
<div class="row col-md-6 well">
<p>
Pour des raisons de sécurité, nous gardons votre mot de passe chiffré, et nous ne pouvons pas vous l'envoyer.
Si vous souhaitez ré-initialiser votre mot de passe, remplissez le formulaire ci-dessous et nous vous enverrons un email pour démarrer la phase de ré-initialisation de votre mot de passe. </p>
OK <br />
Si vous souhaitez ré-initialiser votre mot de passe, remplissez le formulaire ci-dessous et nous vous enverrons un email pour démarrer la phase de ré-initialisation de votre mot de passe.
</p>
<br />
<form id="email_login-form" role="form" action="${url}" method="post">
<div class="form-group">
<label class="control-label" for="login">Mon identifiant</label>

30
mondumas/templates/dossier/dossier_edit.pt
View File

@@ -9,8 +9,8 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="col-xs-4 control-label">Adresse email élève</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Adresse email</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_EMAIL"
value="${dossier.C_EMAIL}" placeholder="50 caractères maximum"
data-fv-emailaddress="true"
@@ -18,8 +18,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Etage</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Etage</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_ETAGE"
value="${dossier.C_ETAGE}" placeholder="10 caractères maximum"
data-fv-stringlength="true"
@@ -28,8 +28,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Code d'accès</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Code d'accès</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_CODE"
value="${dossier.C_CODE}" placeholder="20 caractères maximum"
data-fv-stringlength="true"
@@ -38,8 +38,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Téléphone fixe</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Téléphone fixe</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_TEL1"
value="${dossier.C_TEL1}" placeholder="20 caractères maximum"
data-fv-phone="true"
@@ -48,8 +48,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Téléphone prof.</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Téléphone prof.</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_TEL2"
value="${dossier.C_TEL2}" placeholder="20 caractères maximum"
data-fv-phone="true"
@@ -58,8 +58,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Téléphone mobile</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Téléphone mobile</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_TELP"
value="${dossier.C_TELP}" placeholder="20 caractères maximum"
data-fv-phone="true"
@@ -68,8 +68,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Téléphone fax</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Téléphone fax</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="C_FAX"
value="${dossier.C_FAX}" placeholder="20 caractères maximum"
data-fv-phone="true"
@@ -78,7 +78,7 @@
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-4 col-xs-8">
<div class="col-sm-offset-4 col-sm-8">
<a class="btn btn-default" href="${request.application_url}/dossier_view/${nodossier}">
<span class="glyphicon glyphicon-chevron-left"></span> Annuler</a>
<button class="btn btn-primary" type="submit" name="form.submitted">

10
mondumas/templates/dossier/dossier_lookup.pt
View File

@@ -13,7 +13,7 @@
<div class="form-group">
<label class="control-label col-xs-4" for="societe">Societe</label>
<div class="col-xs-3">
<div class="col-xs-8">
<select class="form-control" id="societe" name="societe">
<div tal:repeat="item societes">
<option value="${item}" tal:attributes="selected societe==item and 'selected' or None">${item}</option>
@@ -22,8 +22,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">Nom ou numéro du chantier</label>
<div class="col-xs-8">
<label class="col-sm-4 control-label">Nom ou numéro du chantier</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="name" value="${name}"
data-fv-notempty="true"
data-fv-notempty-message="Le nom ou le numéro est obligatoire"
@@ -36,7 +36,7 @@
</div>
<!-- case a cocher "Afficher fiches cloturées" -->
<div class="form-group">
<div class="col-xs-offset-4 col-xs-8">
<div class="col-sm-offset-4 col-sm-8">
<input type="checkbox" name="cb_tous" value="cb_tous"
tal:attributes="checked cb_tous == 'oui' and 'checked' or None">
Afficher les chantiers cloturées</input>
@@ -44,7 +44,7 @@
</div>
<div class="form-group">
<div class="col-xs-offset-4 col-xs-8">
<div class="col-sm-offset-4 col-sm-8">
<button class="btn btn-primary" type="submit" name="form.submitted">
<span class="glyphicon glyphicon-search"></span>&nbsp;Rechercher</button>
</div>

10
mondumas/templates/dossier/suivi_edit.pt
View File

@@ -11,8 +11,8 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="control-label col-xs-2" for="comment">Commentaire</label>
<div class="col-xs-10">
<label class="control-label col-sm-3" for="comment">Commentaire</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="COMMENT" name="COMMENT" value="${suivi.COMMENT}"
placeholder="65 caractères maximum"
data-fv-notempty="true"
@@ -24,13 +24,13 @@
</div>
<div class="form-group">
<label class="control-label col-xs-2">Dern. modif le</label>
<div class="col-xs-9">
<label class="control-label col-sm-3">Dern. modif le</label>
<div class="col-sm-9">
<p class="form-control-static">${suivi.DATEMAJ.strftime('%d-%m-%Y %H:%M')} par ${suivi.USERMAJ}</p>
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-10">
<div class="col-sm-offset-3 col-sm-9">
<div class="form-group">
<a class="btn btn-default" href="${request.route_url('dossier_view', nodossier=nodossier)}">
<span class="glyphicon glyphicon-arrow-left"></span> Annuler</a>

3
mondumas/templates/layouts/global_layout.pt
View File

@@ -57,7 +57,7 @@
</button>
<a href="${request.application_url}" alt="Accueil">
<img src="${request.static_url('mondumas:static/img/logo.png')}" class="logo" /></a>
&nbsp;Entreprise DUMAS
<!-- &nbsp;Entreprise DUMAS -->
</div>
<div class="collapse navbar-collapse" id="myNavbar" tal:condition="not layout.isAnonymous()">
<ul class="nav navbar-nav navbar-right">
@@ -98,7 +98,6 @@
<div id="footer">
<div class="well">
<p>© 2017&nbsp;-&nbsp;<a href="http://www.entreprise-dumas.com/" target="_blank">Entreprise Dumas, 49 Chemin du Bois – 69140 RILLIEUX LA PAPE</a></p>
ggggggg
</div>
</div>

10
mondumas/templates/parametres/orphans_de.pt
View File

@@ -5,8 +5,8 @@
<form method="POST" id="frm" class="form-horizontal">
<div class="form-group">
<label class="control-label col-xs-2" for="societe">Societe</label>
<div class="col-xs-6">
<label class="control-label col-xs-3" for="societe">Societe</label>
<div class="col-xs-8">
<select class="form-control" id="societe" name="societe" onChange="$('#frm').submit()">
<div tal:repeat="item societes">
<option value="${item}" tal:attributes="selected societe==item and 'selected' or None">${item}</option>
@@ -63,15 +63,15 @@
<form id="frm-nochantier" action="${url}" method="POST" class="form-horizontal">
<div class="form-group">
<label class="control-label col-xs-2" for="societe">No chantier</label>
<div class="col-xs-2">
<label class="control-label col-sm-2" for="societe">No chantier</label>
<div class="col-sm-2">
<select class="form-control" id="nochantier" name="nochantier">
<div tal:repeat="item nochantiers">
<option value="${item}" tal:attributes="selected nochantier == item and 'selected' or None">${item}</option>
</div>
</select>
</div>
<div class="col-xs-8">
<div class="col-sm-8">
<button class="btn btn-primary" type="submit" name="form.nochantier">
<span class="glyphicon glyphicon-pencil"></span>&nbsp;MAJ No chantier</button>
&nbsp;&nbsp;(Veuillez cocher un ou plusieurs dossiers pour mettre à jour leur no de chantier)

28
mondumas/templates/parametres/user_edit.pt
View File

@@ -11,8 +11,8 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="control-label col-xs-2" for="CD_UTI">Identifiant</label>
<div class="col-xs-2">
<label class="control-label col-sm-3" for="CD_UTI">Identifiant</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="CD_UTI" name="CD_UTI" value="${individu.CD_UTI}"
placeholder="10 caractères maximum"
data-fv-notempty="true"
@@ -23,8 +23,8 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="NOM">Nom et prénom</label>
<div class="col-xs-5">
<label class="control-label col-sm-3" for="NOM">Nom et prénom</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="NOM" name="NOM" value="${individu.NOM}"
placeholder="30 caractères maximum"
data-fv-notempty="true"
@@ -35,8 +35,8 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">Email</label>
<div class="col-xs-5">
<label class="col-sm-3 control-label">Email</label>
<div class="col-sm-9">
<input class="form-control" type="text" name="email" value="${individu.email}"
placeholder="55 caractères maximum"
data-fv-emailaddress="true"
@@ -44,8 +44,8 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="access">Accès</label>
<div class="col-xs-2">
<label class="control-label col-sm-3" for="access">Accès</label>
<div class="col-sm-9">
<select class="form-control" id="access" name="access">
<div tal:repeat="item access">
<option value="${item}" tal:attributes="selected str(individu.access)==item[0] and 'selected' or None">${item}</option>
@@ -54,33 +54,33 @@
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-7 checkbox">
<div class="col-sm-offset-3 col-sm-9 checkbox">
<label><input type="checkbox" name="agenda" value="individu.agenda" id="agenda"
tal:attributes="checked individu.agenda != 0 and 'checked' or None">Peut prendre des rendez-vous
</label>
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-7 checkbox">
<div class="col-sm-offset-3 col-sm-9 checkbox">
<label><input type="checkbox" name="actif" value="individu.actif" id="actif"
tal:attributes="checked individu.actif != 0 and 'checked' or None">La fiche est active
</label>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="access">Dernière modif.</label>
<div class="col-xs-7">
<label class="control-label col-sm-3" for="access">Dernière modif.</label>
<div class="col-sm-9">
<p class="form-control-static">${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}</p>
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-7 checkbox">
<div class="col-sm-offset-3 col-sm-9 checkbox">
<p class="form-control-static">La fiche est active</p>
</div>
</div>
<br />
<div class="form-group">
<div class="col-xs-offset-2 col-xs-10">
<div class="col-sm-offset-3 col-sm-9">
<div class="form-group">
<a class="btn btn-default" href="${request.application_url}/users_list"><span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
<button class="btn btn-primary" type="submit" name="form.submitted">