ajout recherche.pt

caotek_mesavoirs/models/default.py

@@ -36,11 +36,16 @@ def get_docs_bytheme(request, theme):
     results = request.dbsession.execute(query, {'theme': theme}).fetchall()
     return results
 
-def get_blog_themes(request):
+def get_docs_themes(request):
-    query = "SELECT * FROM blog_themes;"
+    query = "SELECT * FROM docs_themes;"
     results = request.dbsession.execute(query).fetchall()
     return results
 
+def get_docs_bycritere(request, critere):
+    query = "SELECT * FROM docs WHERE texte like :critere;"
+    results = request.dbsession.execute(query, {'critere': '%' + critere + '%'}).fetchall()
+    return results
+
 def update_doc(request, doc_id, intitule, texte, theme):
     """créér ou modifier le doc"""
     if doc_id == '0':
@@ -53,5 +58,5 @@ def update_doc(request, doc_id, intitule, texte, theme):
 def delete_doc(request, doc_id):
     """supprimer la doc"""
     query = "delete from docs where doc_id = :doc_id;"
-    results = request.dbsession.execute(query, {'doc_id': doc_id})
+    execute_query(request, query, {'doc_id': doc_id})
 

caotek_mesavoirs/routes.py

@@ -1,10 +1,11 @@
 def includeme(config):
     config.add_static_view('static', 'static', cache_max_age=3600)
     config.add_route('home', '/')
+    config.add_route('apropos', 'apropos')
     config.add_route('archives', '/archives/{theme}')
     config.add_route('doc_edit', '/doc_edit/{doc_id}')
     config.add_route('doc_view', '/doc_view/{doc_id}')
-    config.add_route('memo_view', '/memo_view/{doc_id}')
+    config.add_route('doc_search', '/doc_search')
     # actifs
     config.add_route('actif_edit', '/actif_edit/{no_id}')
     config.add_route('actif2_edit', '/actif2_edit/{no_id}')

caotek_mesavoirs/static/css/style.less

@@ -55,6 +55,10 @@
 	}
 }
 
+.container h2{
+	color: crimson !important;
+}
+
 .container-fluid {
 	padding-top: 2em;
 	padding-bottom: 1em;

caotek_mesavoirs/templates/apropos.pt

@@ -0,0 +1,34 @@
+<metal:block use-macro="main_template">
+<div metal:fill-slot="content">
+
+	<br />
+	<div class="row">
+		<div class="col-sm-6">
+			<div class="panel panel-default text-center">
+				<div class="panel-body">
+					<blockquote>
+						L'argent qu'on possède est l'instrument de la liberté; celui qu'on pourchasse est celui de la servitude.
+					</blockquote>
+				</div>
+				<div class="panel-footer">
+				<h4>Rousseau</h4>
+				</div>
+			</div>
+		</div>
+		<div class="col-sm-5">
+			<div class="panel panel-default text-center">
+				<div class="panel-body">
+					<blockquote>
+						L'intelligence ce n'est pas ce que l'on sait mais ce que l'on fait quand on ne sait pas.
+						<br />
+					</blockquote>
+				</div>
+				<div class="panel-footer">
+				<h4>Jean Piaget</h4>
+				</div>
+			</div>
+		</div>
+	</div>
+
+</div>
+</metal:block>

caotek_mesavoirs/templates/archives.pt

@@ -2,6 +2,9 @@
 <div metal:fill-slot="content">
 
 	<div class="row">
+		<p tal:condition="not layout.isAnonymous()">
+			<a href="${request.application_url}/doc_edit/0">Créer un nouveau post</a>
+		</p>
 		<table class="table">
 			<tr tal:repeat="ligne docs">
 				<td><a href="/doc_view/${ligne.doc_id}"><b>${ligne.intitule}</b></a></td>

caotek_mesavoirs/templates/doc_edit.pt

@@ -37,16 +37,12 @@
 				</div>
 
 				<div class="form-group">
-					<div class="col-sm-offset-2 col-sm-8">
+					<div class="col-sm-offset-2 col-sm-10">
-						<button  class="btn btn-primary" type="submit" name="form.submitted">
-                        <span class="glyphicon glyphicon-ok"></span>&nbsp;Enregistrer</button>
 						<a href="${request.application_url}/doc_view/${doc_id}" class="btn btn-default" role="button">
                         <span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Annuler</a>
-					</div>
+						<button  class="btn btn-primary" type="submit" name="form.submitted">
-				</div>
+                        <span class="glyphicon glyphicon-ok"></span>&nbsp;Enregistrer</button>
-				<div class="form-group" tal:condition="doc_id != '0'">
+						<button  class="btn btn-warning" type="submit" name="form.deleted" tal:condition="doc_id != '0'">
-					<div class="col-sm-offset-2 col-sm-8">
-						<button  class="btn btn-warning" type="submit" name="form.deleted">
                         <span class="glyphicon glyphicon-remove"></span>&nbsp;Supprimer</button>
 					</div>
 				</div>

caotek_mesavoirs/templates/doc_search.pt

@@ -0,0 +1,77 @@
+<metal:block use-macro="main_template">
+<div metal:fill-slot="content">
+
+    <div class="row">
+	<form id="search-form" class="form-horizontal" role="form" action="/doc_search" method="post">
+
+		<div class="form-group">
+			<div class="col-sm-offset-2 col-sm-8">
+			<div class="input-group" align="center">
+				<input type="text" class="form-control"  name="critere" value="${critere}" />
+				<span class="input-group-btn">
+					<button id="submitButton" class="btn btn-primary" type="submit" name="form.submitted">
+						Rechercher
+					</button>
+				</span>
+			</div>
+			</div>
+		</div>
+	</form>
+	</div><!-- row -->
+
+	<div class="row">
+		<div tal:condition="docs">
+			<table class="table table-striped table-bordered">
+				<tr tal:repeat="ligne docs">
+					<td><a href="/doc_view/${ligne.doc_id}"><b>${ligne.intitule}</b></a></td>
+					<td>${ligne.tag1}</td>
+					<td>${ligne.cree_le.strftime("%d-%m-%Y")}</td>
+					<td>${ligne.modif_le.strftime("%d-%m-%Y")}</td>
+				</tr>
+			</table>
+		</div>
+		<div tal:condition="not docs">
+			<p class="text-danger text-center">Aucun document ne correspond à la recherche</p>
+		</div>
+	</div> 
+	<br />
+	<br />
+
+<script>
+$(document).ready(function() {
+	$('#search-form').formValidation({
+		framework: 'bootstrap',
+		message: 'This value is not valid',
+		icon: {
+			valid: 'glyphicon glyphicon-ok',
+			invalid: 'glyphicon glyphicon-remove',
+			validating: 'glyphicon glyphicon-refresh'
+		},
+		fields: {
+			critere: {
+				validators: {
+					notEmpty: {
+						message: 'Veuillez saisir le texte à rechercher'
+					},
+					stringLength: {
+						min: 3,
+						max: 30,
+						message: 'Le texte doit avoir de 3 à 30 caractères de long'
+					},
+				}
+			},
+		}
+	});
+	$('form input').on('keypress', function(e) {
+	var code = e.keyCode || e.which; 
+	if (code === 13) {               
+		e.preventDefault();
+		// simuler clic bouton submit
+		document.getElementById("submitButton").click();
+		}	
+	});
+});
+</script>
+	
+</div>
+</metal:block>

caotek_mesavoirs/templates/doc_view.pt

@@ -1,14 +1,16 @@
 <metal:block use-macro="main_template">
 <div metal:fill-slot="content">
 
-	<a href="${url_retour}">[&nbsp;Fermer&nbsp;]</a>
+	<p>
-	<a href="${request.application_url}/doc_edit/${doc_id}" tal:condition="not layout.isAnonymous">[&nbsp;Modifier&nbsp;]</a>
+		<a href="${url_retour}">[&nbsp;Fermer&nbsp;]</a>&nbsp;
-	<br />
+		<a href="${request.application_url}/doc_edit/${doc_id}" tal:condition="not layout.isAnonymous()">[&nbsp;Modifier&nbsp;]</a>
+	</p>
 	<hr>
 	<div tal:replace="structure texte">
 		Page text goes here.
 	</div>
 	<hr>
+	Dernière modification le ${modif_le}
 	<br />
 	<br />
 

caotek_mesavoirs/templates/layouts/global_layout.pt

@@ -55,7 +55,6 @@
             <div class="collapse navbar-collapse" id="myNavbar">
                 <ul class="nav navbar-nav navbar-right">
                     <!-- <li><a href="${request.application_url}/histo_list">HISTORIQUE</a></li> -->
-                    <li tal:condition="layout.isAnonymous()"><a href="${request.application_url}/login">se connecter</a></li>
                     ${panel('dropdown_menu_panel')}
                 </ul>
             </div>
@@ -89,21 +88,16 @@
 
     <footer class="container-fluid bg-footer">
         <div class="row">
-            <div class="col-xs-offset-2 col-xs-4">
+            <p class="text-center">
-                <p>L'argent que l'on possède est l'instrument de la liberté; celui que l'on pourchasse est celui de la servitude - <b>Rousseau</b></p>
+                Apprendre Restructured Text <a href="https://github.com/ralsina/rst-cheatsheet/blob/master/rst-cheatsheet.rst" target="_blank">(reST)</a><br />
-                <p>L'intelligence ce n'est pas ce que l'on sait mais ce que l'on fait quand on ne sait pas - <b>Jean Piaget</b></p>
+                Apprendre Markdown <a href="https://www.markdownguide.org/basic-syntax/" target="_blank">(md)</a><br />
-            </div>
-            <div class="col-xs-offset-2 col-xs-4">
-                <p>
-                    Apprendre Restructured Text <a href="https://github.com/ralsina/rst-cheatsheet/blob/master/rst-cheatsheet.rst">(reST)</a><br />
-                    Apprendre Markdown <a href="https://www.markdownguide.org/basic-syntax/">(md)</a><br />
-                    <a href="http://www.marinestylefitness.com/">Marine Style Fitness </a><br />
             </p>
-            </div>
-        </div>
             <br />
-        <div class="row">
+            <p class="text-center">&copy; 2017&nbsp;-&nbsp;Phuoc Cao&nbsp;|&nbsp;
-            <p class="text-center">&copy; 2017&nbsp;-&nbsp;www.caotek.fr&nbsp;-&nbsp;Powered by <a href="https://trypyramid.com/">Pyramid</a></p>
+                <a href="${request.application_url}/apropos">A propos</a>&nbsp;|&nbsp;
+                <a href="${request.application_url}/doc_search">recherche</a>&nbsp;|&nbsp;
+                <a href="${request.application_url}/login" tal:condition="layout.isAnonymous()">se connecter</a>&nbsp;|&nbsp;
+            </p>
         </div>
     </footer>
 

caotek_mesavoirs/views/default.py

@@ -102,7 +102,7 @@ def doc_edit(request):
     url = request.route_url('doc_edit',doc_id=doc_id)
 
     message = ""
-    themes = get_blog_themes(request)
+    themes = get_docs_themes(request)
     
     if doc_id == '0':
         titre = "Nouveau doc"
@@ -126,15 +126,15 @@ def doc_edit(request):
             if doc_id != '0':
                 return HTTPFound(location=request.route_url('doc_view', doc_id=doc_id))
             else:
-                return HTTPFound(location=request.route_url('doc_list'))
+                return HTTPFound(location=request.route_url('archives',theme=doc.theme))
         else:
             message = "Veuillez saisir un intitule et un texte."
 
     if 'form.deleted' in request.params:
         if doc_id != '0':
             delete_doc(request, doc_id)
-            request.session.flash(u"<%s> est supprimée avec succès." % intitule, 'success')
+            request.session.flash(u"<%s> est supprimée avec succès." % doc.intitule, 'success')
-            return HTTPFound(location=request.route_url('doc_list'))
+            return HTTPFound(location=request.route_url('archives',theme=doc.theme))
 
     return {
         'page_title': titre,
@@ -147,24 +147,61 @@ def doc_edit(request):
         'themes': themes,
     }
 
+@view_config(route_name='doc_search', renderer='../templates/doc_search.pt')
+def doc_search(request):
+
+    critere = ''
+    docs = []
+    
+    if 'form.submitted' in request.params:
+        critere = request.params['critere']
+        # si afficher tous les fiches ?
+        docs = get_docs_bycritere(request, critere)
+
+    return {
+        'page_title': "Rechercher",
+        'docs': docs,
+        'critere': critere,
+    }
+
+@view_config(route_name='apropos', renderer='../templates/apropos.pt')
+def apropos(request):
+
+
+    return {
+        'page_title': "A propos",
+    }
+
+
 @view_config(route_name='doc_view', renderer='../templates/doc_view.pt')
-@view_config(route_name='memo_view', renderer='../templates/doc_view.pt', permission='view')
 def doc_view(request):
+        
+    logged_in = request.authenticated_userid
     doc_id = request.matchdict['doc_id']    
 
     doc = get_docs(request, doc_id)
+    if logged_in == None and doc.theme == 'memo':
+        # si anonyme, interdire de voir les memo
+        return HTTPFound(location=request.route_url('home'))
+
     intitule = doc.intitule
     url_retour = request.route_url('archives',theme=doc.theme)
     
     # insèrer le path de static/img
-    img_path = 'image:: %s/static/img/' % request.application_url
+    texte = doc.texte.replace('static/img/', "%s/static/img/" % request.application_url)
     
-    texte = doc.texte.replace('image:: static/img/', img_path)
     # convertir reST en HTML
-    texte = publish_parts(texte, writer_name='html')['html_body']
+    # texte = publish_parts(texte, writer_name='html')['html_body']
+    
+    # convertir mardown en HTML
+    from markdown2 import Markdown
+    markdowner = Markdown()
+    texte = markdowner.convert(texte)
+    
     return {
         'page_title': intitule,
         'texte': texte,
+        'modif_le': doc.modif_le.strftime('%d/%m/%Y'),
         'doc_id': doc_id,
         'url_retour':url_retour
     }