Home Explore Help
Sign In
idleman
/
hackpoint
1
0
Fork 0
Files Issues 11 Pull Requests 0 Wiki
Browse Source

ergonomie + index de sketch publiques

idleman 8 years ago
parent
ceb3ebb1b4
commit
b5a36af664
6 changed files with 66 additions and 48 deletions
Split View Show Diff Stats
  1. 7 1
      action.php
  2. 22 0
      css/main.css
  3. 30 29
      header.php
  4. BIN
      img/favicon.png
  5. BIN
      img/icon.png
  6. 7 18
      index.php

+ 7 - 1
action.php
View File 

@@ -156,7 +156,13 @@ switch ($_['action']){
 
 	case 'search_sketch':
 
 		Action::write(function($_,&$response){
 
 			global $myUser;
 
-			$sketchs = Sketch::loadAll(array('owner'=>$myUser->id));
 
+			
+			$filters = array('public'=>1);
 
+			if($myUser->connected()){
 
+				$filters = array('owner'=>$myUser->id);
 
+			}
 
+			
+			$sketchs = Sketch::loadAll($filters);
 
 			foreach($sketchs as $sketch){
 
 				$sketch->label = html_entity_decode($sketch->label);
 
 				$response['rows'][] = $sketch->toArray();

+ 22 - 0
css/main.css
View File 

@@ -55,6 +55,12 @@ display:none;
 
 	cursor:pointer;
 
 }
 
 
+#sketchBlock h2{
 
+	margin:0 10px 0 0;
 
+	display:inline-block;
 
+	vertical-align:top;
 
+}
 
+
 
 .footer{
 
 	position: relative;
 
 	height: 60px;
 
@@ -224,6 +230,17 @@ div.CodeMirror{
 
 	margin-top:0;
 
 }
 
 
+#loginForm {
 
+    color: #8c8c8c;
 
+    margin: 15px 0px 0 0;
 
+}
 
+#loginForm input {
 
+    width: 100px;
 
+    height: auto;
 
+    border-radius: 0;
 
+    padding: 0 5px 0 5px;
 
+}
 
+
 
 .componentImage{
 
 	width:100px;
 
 	height:100px;
 
@@ -258,3 +275,8 @@ div.CodeMirror{
 
 	cursor:pointer;
 
 	text-align: center;
 
 }
 
+
 
+a.navbar-brand {
 
+    padding-left: 45px;
 
+    background: url('../img/icon.png') no-repeat 5px center !important;
 
+}

+ 30 - 29
header.php
View File 

@@ -4,17 +4,18 @@ require_once __DIR__.DIRECTORY_SEPARATOR.'common.php';
 
 <!doctype html>
 
 <html class="no-js" lang="">
 
     <head>
 
-        <meta charset="utf-8">
 
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-        <title><?php echo PROGRAM_NAME.' V'.SOURCE_VERSION.'.'.BASE_VERSION ?></title>
 
-        <meta name="description" content="">
 
-        <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  		<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
 
-  		<link rel="stylesheet" href="css/bootflat.min.css">
 
-      <link rel="stylesheet" href="css/font-awesome.min.css">
 
-      <link rel="stylesheet" href="css/codemirror.css">
 
-      <link rel="stylesheet" href="css/monokai.css">
 
-      <link rel="stylesheet" href="css/main.css">
 
+		<meta charset="utf-8">
 
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+		<title><?php echo PROGRAM_NAME.' V'.SOURCE_VERSION.'.'.BASE_VERSION ?></title>
 
+		<link rel="icon" type="image/png" href="img/favicon.png">
 
+		<meta name="description" content="">
 
+		<meta name="viewport" content="width=device-width, initial-scale=1">
 
+		<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
 
+		<link rel="stylesheet" href="css/bootflat.min.css">
 
+		<link rel="stylesheet" href="css/font-awesome.min.css">
 
+		<link rel="stylesheet" href="css/codemirror.css">
 
+		<link rel="stylesheet" href="css/monokai.css">
 
+		<link rel="stylesheet" href="css/main.css">
 
     </head>
 
     <body>
 
         <div id="wrap">
 
@@ -36,28 +37,27 @@ require_once __DIR__.DIRECTORY_SEPARATOR.'common.php';
 
                     </div>
 
                     <!-- Collect the nav links, forms, and other content for toggling -->
 
                     
-					<?php if ($myUser->connected()): ?>
 
+					
 					<div id="bs-example-navbar-collapse-5" class="collapse navbar-collapse">
 
                       <ul class="nav navbar-nav">
 
                         <li <?php echo $page=='index.php'?'class="active"':''; ?>><a href="index.php">Sketch</a></li>
 
-                        <li <?php echo $page=='component.php'?'class="active"':''; ?>><a href="component.php">Composants</a></li>
 
-                        <!--
 
-                        <li class="dropdown">
 
-                          <a data-toggle="dropdown" class="dropdown-toggle" href="#">Réglages <b class="caret"></b></a>
 
-                          <ul role="menu" class="dropdown-menu">
 
-                            <li class="dropdown-header">Setting</li>
 
-                            <li><a href="#">Action</a></li>
 
-                            <li><a href="#">Another action</a></li>
 
-                            <li><a href="#">Something else here</a></li>
 
-                            <li class="divider"></li>
 
-                            <li class="active"><a href="#">Separated link</a></li>
 
-                            <li class="divider"></li>
 
-                            <li class="disabled"><a href="#">One more separated link</a></li>
 
-                          </ul>
 
-                        </li>
 
-                        -->
 
+                        <?php if ($myUser->connected()): ?>
 
+						<li <?php echo $page=='component.php'?'class="active"':''; ?>><a href="component.php">Composants</a></li>
 
+						<?php endif; ?>
 
                       </ul>
 
                       <ul class="nav navbar-nav navbar-right">
 
+					  
+						<?php if (!$myUser->connected()): ?>
 
+						<li>
 
+							<form id="loginForm" method="post" action="action.php?action=login" class="navbar-form navbar-right">
 
+								Identifiant : 
+								<input name="login" placeholder="Identifiant" class="form-control" type="text">
 
+								Mot de passe : 
+								<input name="password" placeholder="Mot de passe" class="form-control" type="password">
 
+								<input class="btn btn-success" value="Connexion" type="submit">
 
+							</form>
 
+						</li>
 
+						<?php else: ?>
 
                         <li class="dropdown <?php echo $page=='account.php'?'active':''; ?>" >
 
                           <a data-toggle="dropdown" class="dropdown-toggle" href="#"> Connecté en tant que <?php echo $myUser->login; ?> <b class="caret"></b></a>
 
                           <ul role="menu" class="dropdown-menu">
 
@@ -67,6 +67,7 @@ require_once __DIR__.DIRECTORY_SEPARATOR.'common.php';
 
                             <li><a href="action.php?action=logout">Déconnexion</a></li>
 
                           </ul>
 
                         </li>
 
+						<?php endif; ?>
 
                       </ul>
 
 					 
 
@@ -75,7 +76,7 @@ require_once __DIR__.DIRECTORY_SEPARATOR.'common.php';
 
 					           <!--<button class="btn btn-danger navbar-btn" onclick="window.location='action.php?action=logout';" type="button">MAJ</button>-->
 
 					  
                     </div><!-- /.navbar-collapse -->
 
-					<?php endif; ?>
 
+					
 					
 					
                   </div><!-- /.container-fluid -->

BIN
img/favicon.png
View File


BIN
img/icon.png
View File


+ 7 - 18
index.php
View File 

@@ -1,10 +1,12 @@
 
 <?php require_once __DIR__.DIRECTORY_SEPARATOR.'header.php'; ?>
 
 
-	<?php if ($myUser->connected()): ?>
 
+	
 
-			<div class="jumbotron">
 
+			<div class="jumbotron" id="sketchBlock">
 
 			<div class="jumbotron-contents">
 
-				<h2>Mes sketch(s)</h2>
 
+				<h2>Sketch(s)</h2>
 
+				
+				<?php if ($myUser->connected()): ?>
 
 				<div class="btn-group">
 
 				  <button class="btn btn-success" type="button" data-toggle="modal" data-target="#editSketch">Ajouter</button>
 
 				  <button data-toggle="dropdown" class="btn btn-success dropdown-toggle" type="button">
 
@@ -17,6 +19,7 @@
 
 					<li><a id="importJsonSketch">Importer depuis un fichier json</a></li>
 
 				  </ul>
 
 				</div>
 
+				<?php endif; ?>
 
 				
 				<table class="table table-striped table-hover" id="sketchs">
 
 					<thead>
 
@@ -85,21 +88,7 @@
 
 	  </div>
 
 	</div>
 
 			
-	<?php else: ?>
 
-		<div class="jumbotron"  id="loginBlock">
 
-			<div class="jumbotron-contents">
 
-				<h2>Connexion</h2>
 
-				<form action="action.php?action=login" method="post">
 
-				<label for="login">Identifiant</label>
 
-				<input type="text" class="form-control" name="login" placeholder="Identifiant">
 
-				<label for="password">Mot de passe</label>
 
-				<input type="password" class="form-control" name="password"  placeholder="Mot de passe">
 
-				<br/>
 
-				<input type="submit" class="btn btn-primary btn-block" value="Connexion"/>
 
-				</form>
 
-			</div>
 
-		</div>
 
-	<?php endif; ?>
 
+
 
 
 <?php