display log of tests

1 files changed, 131 insertions, 53 deletions

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 03fb5a5..bcea9be 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -24,9 +24,11 @@
  *
  */
 script('nextant', 'settings.admin');
+style('nextant', 'admin');
+
 ?>
 <div class="section" id="nextant">
-	<h2><?php p($l->t('Nextant (Solr)')) ?></h2>
+	<h2><?php p($l->t('Nextant (Full-Text Search)')) ?></h2>
 
 	<table>
 		<tr>
@@ -36,30 +38,86 @@ script('nextant', 'settings.admin');
 						few guides on how to install one on the Wiki</a></em></td>
 		</tr>
 		<tr>
-			<td>&nbsp;</td>
-		</tr>
+			<td>
+				<table>
+					<tr>
+						<td>&nbsp;</td>
+					</tr>
+					<tr>
+						<td style="text-align: right;"><label>
+	    <?php p($l->t('Address of your Solr Servlet :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
+						<td><input type="text" name="solr_url" id="solr_url"
+							value="<?php p($_['solr_url'])?>" style="width: 250px;"></td>
+					</tr>
+
+					<tr>
+						<td style="text-align: right;"><label><?php p($l->t('Core :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
+						<td><input type="text" id="solr_core"
+							value="<?php p($_['solr_core'])?>" style="width: 250px;"></td>
+					</tr>
+
+					<tr>
+						<td></td>
+						<td>
+							<button type="button" id="nextant_apply" style="width: 270px"><?php p($l->t('Test and Save')) ?></button>
+						</td>
+					</tr>
+					<tr>
+						<td>&nbsp;</td>
+					</tr>
+					<!--  					<tr style="height: 40px;">
+						<td colspan="2" style="text-align: center; width: 300px;"><span
+							id="nextant-admin-msg" class="msg"></span></td>
+					</tr>
+							-->
 		<?php
 
 if ($_['configured'] == '1') {
     ?>
-		<tr>
-			<td style="width: 250px; text-align: right;"><label>
-	    <?php p($l->t('Number of documents :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
-			<td><?php ($_['current_docs'] === false) ? p('Solr Servlet is down') : p($_['current_docs']); ?></td>
-		</tr>
-		<tr>
-			<td style="width: 250px; text-align: right;"><label>
+		
+					<tr style="height: 30px;">
+						<td style="text-align: right;"><label>
+	    <?php p($l->t('Live Extract :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
+						<td><input type="checkbox" name="solr_live_extract"
+							id="solr_live_extract" value="1"
+							<?php if ($_['live_extract'] == '1') { p('CHECKED'); } ?>
+							style="margin: 10px;"> (<a
+							href="https://github.com/daita/nextant/wiki/Extracting-&-Live-Update"
+							target="_blank">help</a>)</td>
+					</tr>
+
+					<tr style="height: 30px;">
+						<td style="text-align: right;"><label>
+	    <?php p($l->t('Live Document Update :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
+						<td><input type="checkbox" name="solr_live_docupdate"
+							id="solr_live_docupdate" value="1"
+							<?php if ($_['live_docupdate'] == '1') { p('CHECKED'); } ?>
+							style="margin: 10px;"></td>
+					</tr>
+					<tr style="height: 20px;">
+						<td style="width: 250px; text-align: right;"><label>
 	    <?php p($l->t('Last index:')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
-			<td><?php
+						<td><?php
     
     if ($_['last_index'] > 0) {
         p(date('r', $_['last_index']));
         ?></td>
-			<td><?php
+
+					</tr>
+					<tr style="height: 20px;">
+						<td style="width: 250px; text-align: right;"><label>
+	    <?php p($l->t('Number of documents :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
+						<td><?php ($_['current_docs'] === false) ? p('Solr Servlet is down') : p($_['current_docs']); ?></td>
+					</tr>
+
+					<tr>
+						<td></td>
+
+						<td><?php
         if ($_['needed_index'] == 0) {
             ?>
 			          <button type="button" id="nextant_force_index"
-					style="width: 170px"><?php p($l->t('Force re-index')) ?></button>
+								style="width: 270px"><?php p($l->t('Force re-index')) ?></button>
 			          <?php
         } else 
             if ($_['needed_index'] == 2) {
@@ -69,54 +127,74 @@ if ($_['configured'] == '1') {
     } else
         p('never');
     ?></td>
-		</tr>
-<?php } ?>
-	   <tr>
-			<td style="text-align: right;"><label>
-	    <?php p($l->t('Live Extract :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
-			<td><input type="checkbox" name="solr_live_extract"
-				id="solr_live_extract" value="1"
-				<?php if ($_['live_extract'] == '1') { p('CHECKED'); } ?>
-				style="margin: 10px;"> (<a
-				href="https://github.com/daita/nextant/wiki/Extracting-&-Live-Update"
-				target="_blank">help</a>)</td>
-		</tr>
+					</tr>
+						<?php } ?>
+					
+				</table>
+			</td>
+			<td style="padding-left: 40px;">
+				<div id="nextant-display">
+					<div id="ping" class="nextant-display-line">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
 
-		<tr>
-			<td style="text-align: right;"><label>
-	    <?php p($l->t('Live Document Update :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
-			<td><input type="checkbox" name="solr_live_docupdate"
-				id="solr_live_docupdate" value="1"
-				<?php if ($_['live_docupdate'] == '1') { p('CHECKED'); } ?>
-				style="margin: 10px;"></td>
-		</tr>
+					<div id="schema" class="nextant-display-line" style="top: 30px;">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
 
-		<tr>
-			<td style="text-align: right;"><label>
-	    <?php p($l->t('Address of your Solr Servlet :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
-			<td><input type="text" name="solr_url" id="solr_url"
-				value="<?php p($_['solr_url'])?>" style="width: 360px;"></td>
-		</tr>
+					<div id="extract" class="nextant-display-line" style="top: 60px;">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
 
-		<tr>
-			<td style="text-align: right;"><label><?php p($l->t('Core :')) ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></td>
-			<td><input type="text" id="solr_core"
-				value="<?php p($_['solr_core'])?>" style="width: 360px;"></td>
-		</tr>
+					<div id="update" class="nextant-display-line" style="top: 90px;">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
 
-		<tr>
-			<td></td>
-			<td>
-				<button type="button" id="nextant_apply" style="width: 370px"><?php p($l->t('Test and Save')) ?></button>
+					<div id="search" class="nextant-display-line" style="top: 120px;">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
+
+					<div id="delete" class="nextant-display-line" style="top: 150px;">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
+
+					<div id="save" class="nextant-display-line" style="top: 190px;">
+						<img id="icon_check" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'check.png')); ?>" />
+						<img id="icon_fail" class="nextant_display_icon"
+							src="<?php print_unescaped(OCP\image_path('nextant', 'fail.png')); ?>" />
+						<div id="text" class="nextant_display_text"></div>
+					</div>
+
+				</div>
 			</td>
 		</tr>
 
-		<tr style="height: 40px;">
-			<td colspan="2" style="text-align: center; width: 550px;"><span
-				id="nextant-admin-msg" class="msg"></span></td>
-		</tr>
 	</table>
-
 </div>