new icons ?

css/main.css

@@ -408,7 +408,7 @@ img {
 }
 
 .date {
-    font:  14px Verdana, Arial,sans-serif;
+    font:  16px Verdana, Arial,sans-serif !important;
 }
 
 #rating {

inc/editDB.php

@@ -53,7 +53,7 @@
 <section class='item'>
 <a class='align_right' href='delete_item.php?id=<?php echo $id;?>' onClick="return confirm('Delete this item ?');"><img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/trash.png' title='delete' alt='delete' /></a>
 <!-- ADD TAG FORM -->
-<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/tags.gif' alt='tags' /> <h4>Tags</h4><span class='smallgray'> (click a tag to remove it)</span><br />
+<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/tags.png' alt='tags' /> <h4>Tags</h4><span class='smallgray'> (click a tag to remove it)</span><br />
 <div class='tags'>
 <span id='tags_div'>
 <?php
@@ -76,7 +76,7 @@
 <input name='item_id' type='hidden' value='<?php echo $id;?>' />
 <h4>Date</h4><span class='smallgray'> (date format : YYMMDD)</span><br />
 <!-- TODO if firefox has support for it: type = date -->
-<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/calendar.png' title='date' alt='Date :' /><input name='date' id='datepicker' size='6' type='text' value='<?php echo $data['date'];?>' />
+<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/calendar.png' title='date' alt='Date :' /> <input name='date' id='datepicker' size='6' type='text' value='<?php echo $data['date'];?>' />
 <!-- STAR RATING via ajax request -->
 <div id='rating'>
 <input id='star1' name="star" type="radio" class="star" value='1' <?php if ($data['rating'] == 1){ echo "checked=checked ";}?>/>
@@ -246,11 +246,15 @@ function updateRating(rating) {
     title = "<?php echo $data['title']; ?>".replace(/\&#39;/g, "'").replace(/\&#34;/g, "\"");
     document.title = title;
 
+    /*
+     * commented out because it should only ask when the user didn't save
+     *
     // ask the user if he really wants to navigate out of the page
     window.onbeforeunload = function (e) {
           e = e || window.event;
           return 'Do you want to navigate away from this page ? Unsaved changes will be lost !';
     };
+    */
 });
 </script>
 

inc/editXP.php

@@ -61,7 +61,7 @@
 <section id='view_xp_item' class='item <?php echo $data['status'];?>'>
 <a class='align_right' href='delete_item.php?id=<?php echo $id;?>&type=exp' onClick="return confirm('Delete this experiment ?');"><img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/trash.png' title='delete' alt='delete' /></a>
 <!-- ADD TAG FORM -->
-<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/tags.gif' alt='tags' /> <h4>Tags</h4><span class='smallgray'> (click a tag to remove it)</span><br />
+<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/tags.png' alt='tags' /> <h4>Tags</h4><span class='smallgray'> (click a tag to remove it)</span><br />
 <div class='tags'>
 <span id='tags_div'>
 <?php
@@ -84,7 +84,7 @@
 
 <h4>Date</h4><span class='smallgray'> (date format : YYMMDD)</span><br />
 <!-- TODO if firefox has support for it: type = date -->
-<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/calendar.png' title='date' alt='Date :' /><input name='date' id='datepicker' size='6' type='text' value='<?php echo $data['date'];?>' />
+<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/calendar.png' title='date' alt='Date :' /> <input name='date' id='datepicker' size='6' type='text' value='<?php echo $data['date'];?>' />
 
 <span class='align_right'>
 <h4>Status</h4>
@@ -130,7 +130,7 @@
 
 <hr class='flourishes'>
 
-<h4>Linked items</h4>
+<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/link.png'> <h4 style='display:inline'>Linked items</h4>
 <div id='links_div'>
 <?php
 // DISPLAY LINKED ITEMS
@@ -163,7 +163,7 @@
 <input id='linkinput' size='60' type="text" name="link" placeholder="from the database" />
 
 <br /><br />
-<h4>Visibility</h4>
+<img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/visibility.png'> <h4 style='display:inline'>Visibility</h4>
 <!-- visibility get selected by default -->
 <?php
 $visibility = $data['visibility'];
@@ -426,12 +426,16 @@ function() {
     jQuery('#linkinput').keypress(function (e) {
         addLinkOnEnter(e);
     });
+    /*
+     * commented out because it should only ask when the user didn't save
+     *
 
     // ask the user if he really wants to navigate out of the page
     window.onbeforeunload = function (e) {
           e = e || window.event;
           return 'Do you want to navigate away from this page ? Unsaved changes will be lost !';
     };
+    */
 });
 </script>
 

inc/file_upload.php

@@ -37,7 +37,7 @@ function abort() {
 </script>
 <hr class='flourishes'><div class="bigUpload inline">
     <div class="bigUploadContainer">
-        <h3>Attach a file</h3>
+    <img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/upload.png'> <h3 style='display:inline'>Attach a file</h3>
         <form action="inc/bigUpload.php?action=post-unsupported" method="post" enctype="multipart/form-data" id="bigUploadForm">
             <input type="file" id="bigUploadFile" name="bigUploadFile" />
             <input type="button" class="bigUploadButton" value="Start Upload" id="bigUploadSubmit" onclick="upload()" />

inc/functions.php

@@ -196,7 +196,7 @@ function show_tags($item_id, $table) {
     $req->execute();
     $tagcount = $req->rowCount();
     if ($tagcount > 0) {
-        echo "<span class='tags'><img src='themes/".$_SESSION['prefs']['theme']."/img/tags.gif' alt='tags' /> ";
+        echo "<span class='tags'><img src='themes/".$_SESSION['prefs']['theme']."/img/tags.png' alt='tags' /> ";
         while($tags = $req->fetch()) {
             if ($table === 'experiments_tags') {
             echo "<a href='experiments.php?mode=show&tag=".urlencode(stripslashes($tags['tag']))."'>".stripslashes($tags['tag'])."</a> ";
@@ -237,7 +237,7 @@ function showXP($id, $display) {
     echo show_tags($id, 'experiments_tags');
     // view link
     echo "<a href='experiments.php?mode=view&id=".$final_query['id']."'>
-        <img class='align_right' style='margin-left:5px;' src='img/view.png' alt='view' title='view experiment' /></a>";
+        <img class='align_right' style='margin-left:5px;' src='img/arrow_right.png' alt='view' title='view experiment' /></a>";
     // show attached if there is a file attached
     if (has_attachement($final_query['id'])) {
         echo "<img class='align_right' src='themes/".$_SESSION['prefs']['theme']."/img/attached_file.png' alt='file attached' />";
@@ -318,7 +318,7 @@ function showDB($id, $display) {
         echo show_tags($id, 'items_tags');
         // view link
         echo "<a href='database.php?mode=view&id=".$final_query['id']."'>
-        <img class='align_right' style='margin-left:5px;' src='img/view.png' alt='view' title='view item' /></a>";
+        <img class='align_right' style='margin-left:5px;' src='img/arrow_right.png' alt='view' title='view item' /></a>";
         // STARS
         show_stars($final_query['rating']);
         // show attached if there is a file attached

inc/menu.php

@@ -42,7 +42,7 @@
 ?>
     <!-- ADMIN MENU --> 
     <a href='https://twitter.com/elabftw'>
-        <img src='img/twitter-bird-16x16.png' alt='twitter' title='Follow eLabFTW on Twitter !'>
+        <img src='img/twitter.png' alt='twitter' title='Follow eLabFTW on Twitter !'>
     </a> | 
     <a id='check_for_updates' href='#'>Check for updates</a> | <a href='admin.php'>Admin Panel</a> | 
     <script>

inc/showDB.php

@@ -42,7 +42,7 @@
 $req->execute();
 
 // 'Create new' dropdown menu
-echo "<img src='themes/".$_SESSION['prefs']['theme']."/img/create.gif' alt='create' /> Create new <select onchange=go_url(this.value)><option value=''>--------</option>";
+echo "<img src='themes/".$_SESSION['prefs']['theme']."/img/notepad_add.png' alt='create' /> Create new <select onchange=go_url(this.value)><option value=''>--------</option>";
 while ($items_types = $req->fetch()) {
     echo "<option value='create_item.php?type=".$items_types['id']."' name='type' ";
     echo ">".$items_types['name']."</option>";

inc/showXP.php

@@ -36,7 +36,7 @@
         <input id='big_search_input' type='search' name='q' size='50' placeholder='Type your search' />
     </form>
     <br />
-    <a href="create_item.php?type=exp"><img src="themes/<?php echo $_SESSION['prefs']['theme'];?>/img/create.gif" alt="" /> Create experiment</a> | 
+    <a href="create_item.php?type=exp"><img src="themes/<?php echo $_SESSION['prefs']['theme'];?>/img/notepad_add.png" alt="" /> Create experiment</a> | 
     <a href='#' class='trigger'><img src="themes/<?php echo $_SESSION['prefs']['theme'];?>/img/duplicate.png" alt="" /> Create from template</a> |
     <a onmouseover="changeSrc('<?php echo $_SESSION['prefs']['theme'];?>')" onmouseout="stopAnim('<?php echo $_SESSION['prefs']['theme'];?>')" href='experiments.php?mode=show&q=runningonly'><img id='runningimg' src="themes/<?php echo $_SESSION['prefs']['theme'];?>/img/running.fix.png" alt="running" /> Show running experiments</a>
 </div><!-- end submenu -->
@@ -239,7 +239,7 @@
     if ($count == 0) {
         $message = "<strong>Welcome to eLabFTW.</strong> 
             Click the <a style='color:blue;' href='create_item.php?type=exp'>
-            <img src='themes/".$_SESSION['prefs']['theme']."/img/create.gif' alt='Create experiment' />
+            <img src='themes/".$_SESSION['prefs']['theme']."/img/notepad_add.png' alt='Create experiment' />
             Create experiment</a> button to get started."; 
         display_message('info', $message);
     } else {

inc/viewDB.php

@@ -40,18 +40,21 @@
 $data = $req->fetch();
 ?>
 <section class="item">
+
 <a class='align_right' href='delete_item.php?id=<?php echo $data['id'];?>' onClick="return confirm('Delete this item ?');"><img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/trash.png' title='delete' alt='delete' /></a>
+
+<span class='date'><img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/calendar.png' title='date' alt='Date :' /> <?php echo $data['date'];?></span><br />
+
 <h3 style='color:#<?php echo get_item_info_from_id($data['type'], 'bgcolor');?>'><?php echo get_item_info_from_id($data['type'], 'name');?> </h3>
 <?php
-echo "<span class='date'><img src='themes/".$_SESSION['prefs']['theme']."/img/calendar.png' title='date' alt='Date :' />".$data['date']."</span><br />";
 show_stars($data['rating']);
 // buttons
 echo "<a href='database.php?mode=edit&id=".$data['id']."'><img src='themes/".$_SESSION['prefs']['theme']."/img/edit.png' title='edit' alt='edit' /></a> 
 <a href='duplicate_item.php?id=".$data['id']."&type=db'><img src='themes/".$_SESSION['prefs']['theme']."/img/duplicate.png' title='duplicate item' alt='duplicate' /></a> 
 <a href='make_pdf.php?id=".$data['id']."&type=items'><img src='themes/".$_SESSION['prefs']['theme']."/img/pdf.png' title='make a pdf' alt='pdf' /></a> 
 <a href='javascript:window.print()'><img src='themes/".$_SESSION['prefs']['theme']."/img/print.png' title='Print this page' alt='Print' /></a> 
-<a href='make_zip.php?id=".$data['id']."&type=items'><img src='themes/".$_SESSION['prefs']['theme']."/img/zip.gif' title='make a zip archive' alt='zip' /></a>
-<a href='experiments.php?mode=show&related=".$data['id']."'><img src='img/related.png' alt='Linked experiments' title='Linked experiments' /></a> ";
+<a href='make_zip.php?id=".$data['id']."&type=items'><img src='themes/".$_SESSION['prefs']['theme']."/img/zip.png' title='make a zip archive' alt='zip' /></a>
+<a href='experiments.php?mode=show&related=".$data['id']."'><img src='themes/".$_SESSION['prefs']['theme']."/img/link.png' alt='Linked experiments' title='Linked experiments' /></a> ";
 // lock
 if($data['locked'] == 0) {
     echo "<a href='lock-exec.php?id=".$data['id']."&action=lock&type=items'><img src='themes/".$_SESSION['prefs']['theme']."/img/unlock.png' title='lock experiment' alt='lock' /></a>";

inc/viewXP.php

@@ -61,12 +61,12 @@
 <section class="item <?php echo $data['status'];?>">
 <a class='align_right' href='delete_item.php?id=<?php echo $data['id'];?>&type=exp' onClick="return confirm('Delete this experiment ?');"><img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/trash.png' title='delete' alt='delete' /></a>
 <?php
-echo "<span class='date'><img src='themes/".$_SESSION['prefs']['theme']."/img/calendar.png' title='date' alt='Date :' />".$data['date']."</span><br />
+echo "<img src='themes/".$_SESSION['prefs']['theme']."/img/calendar.png' title='date' alt='Date :' /><span class='date'> ".$data['date']."</span><br />
     <a href='experiments.php?mode=edit&id=".$data['id']."'><img src='themes/".$_SESSION['prefs']['theme']."/img/edit.png' title='edit' alt='edit' /></a> 
 <a href='duplicate_item.php?id=".$data['id']."&type=exp'><img src='themes/".$_SESSION['prefs']['theme']."/img/duplicate.png' title='duplicate experiment' alt='duplicate' /></a> 
 <a href='make_pdf.php?id=".$data['id']."&type=experiments'><img src='themes/".$_SESSION['prefs']['theme']."/img/pdf.png' title='make a pdf' alt='pdf' /></a> 
 <a href='javascript:window.print()'><img src='themes/".$_SESSION['prefs']['theme']."/img/print.png' title='Print this page' alt='Print' /></a> 
-<a href='make_zip.php?id=".$data['id']."&type=exp'><img src='themes/".$_SESSION['prefs']['theme']."/img/zip.gif' title='make a zip archive' alt='zip' /></a> ";
+<a href='make_zip.php?id=".$data['id']."&type=exp'><img src='themes/".$_SESSION['prefs']['theme']."/img/zip.png' title='make a zip archive' alt='zip' /></a> ";
 // lock
 if($data['locked'] == 0) {
     echo "<a href='lock-exec.php?id=".$data['id']."&action=lock&type=experiments'><img src='themes/".$_SESSION['prefs']['theme']."/img/unlock.png' title='lock experiment' alt='lock' /></a>";

search.php

@@ -284,7 +284,7 @@
                 <div id='export_menu'>
                 <p class='inline'>Export this result : </p>
                 <a href='make_zip.php?id=<?php echo $results_id_str;?>&type=exp'>
-                <img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/zip.gif' title='make a zip archive' alt='zip' /></a>
+                <img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/zip.png' title='make a zip archive' alt='zip' /></a>
 
                     <a href='make_csv.php?id=<?php echo $results_id_str;?>&type=exp'><img src='img/spreadsheet.png' title='Export in spreadsheet file' alt='Export in spreadsheet file' /></a>
                 </div>
@@ -343,7 +343,7 @@
             <div id='export_menu'>
             <p class='inline'>Export this result : </p>
             <a href='make_zip.php?id=<?php echo $results_id_str;?>&type=items'>
-            <img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/zip.gif' title='make a zip archive' alt='zip' /></a>
+            <img src='themes/<?php echo $_SESSION['prefs']['theme'];?>/img/zip.png' title='make a zip archive' alt='zip' /></a>
 
                 <a href='make_csv.php?id=<?php echo $results_id_str;?>&type=items'><img src='img/spreadsheet.png' title='Export in spreadsheet file' alt='Export in spreadsheet file' /></a>
             </div>