Changeset 480 in t29-www for en

Timestamp:

Dec 26, 2013, 9:41:48 AM (9 years ago)

Author:

heribert

Message:

Navigation verbessert, IBM 1130 hinzugefügt und andere Änderungen

Location:

en

Files:

• computer/gamma10.php (modified) (1 diff)
• computer/gamma3.php (modified) (1 diff)
• computer/gamma55.php (modified) (1 diff)
• computer/ibm1130.php (added)
• computer/punchcard.php (modified) (1 diff)
• computer/univac9400.php (modified) (1 diff)
• navigation.xml (modified) (3 diffs)

en/computer/gamma10.php

@@ -6 +6 @@
         require "../../lib/technikum29.php";
 ?>
-    <h2>A second generation calculator:  BULL GAMMA&nbsp;10</h2>
+    <h2>A second generation calculator:  <b>BULL GAMMA&nbsp;10</b></h2>
 
     <div class="box center auto-bildbreite">

en/computer/gamma3.php

@@ -6 +6 @@
         require "../../lib/technikum29.php";
 ?>
-    <h2>A first generation tube calculator: BULL GAMMA 3</h2>
+    <h2>A first generation tube calculator: <b>BULL GAMMA 3</b></h2>
 
     <div class="box left clear-after">

en/computer/gamma55.php

@@ -7 +7 @@
 ?>
     
-        <h2>A second generation calculator: The BULL GAMMA 55 (GE-55)</h2>
+        <h2>A second generation calculator: <b> BULL GAMMA 55</b> (GE-55)</h2>
         
          <div class="box center clear-after">

en/computer/punchcard.php

@@ -105 +105 @@
     </p>
 
+        <h3 id="reproducing">Reproducing Punch</h3>
+        <p>To be done</p>
         
         <h3>Sorters</h3>

en/computer/univac9400.php

@@ -6 +6 @@
         require "../../lib/technikum29.php";
 ?>
-    <h2>UNIVAC mainframe computer, data center</h2>
+    <h2><b>UNIVAC 9400</b> mainframe computer, data center</h2>
 
     <div class="box center" style="position:relative;">

en/navigation.xml

@@ -41 +41 @@
 <ul class="u1">
         <li class="guide-only start"><a href="/en/">Start</a></li>
-        <li><a href="/en/computer/electro-mechanical.php#COMPUTER_HISTORY">Computer History</a>
+        <li class="collapsible-button-after first"><!-- first wg. separierender Linien ab 25.12.2013 -->
+                <a href="/en/computer/electro-mechanical.php#COMPUTER_HISTORY">Computer History</a>
                 <ul class="u2">
                         <li><a seiten_id="elektro-mechanik" href="/en/computer/electro-mechanical.php">Mechanical calculators</a>
@@ -49 +50 @@
                                 </ul>
                         </li>
-                        <li><a href="/en/computer/punchcard.php">Punch card computing</a>
-                                <ul class="u3">
-                                        <li><a seiten_id="lochkarten" href="/en/computer/punchcard.php" title="Punchers and Periphery">Punchers</a></li>
+                        <li><a seiten_id="lochkarten" href="/en/computer/punchcard.php">Punch card computing</a>
+                                <ul class="u3">
+                                        <li><a href="/en/computer/punchcard.php#Card_puncher_devices" title="Card puncher devices">Punchers</a></li>
+                                        <li><a href="/en/computer/punchcard.php#reproducing">Reproducing Punch</a></li>
+                                        <li><a href="/en/computer/punchcard.php#Sorters">Sorters</a></li>
+                                        <li><a href="/en/computer/punchcard.php#Collators">Collators</a></li>
+                                        <li><a href="/en/computer/punchcard.php#Alphabetic_Interpreter">Alphabetic Interpreter</a></li>
+                                        <li><a href="/en/computer/punchcard.php#ANELEX_high_speed_printer">High speed printer</a></li>
                                         <li><a seiten_id="tabelliermaschine" href="/en/computer/tabulating-machine.php">Tabulating machine</a></li>
+                                </ul>
+                                <ul class="u3 geraete">
+                                        <li><a seiten_id="punchcard-collator" href="/en/devices/punchcard-collator.php">The function of the punch card collator</a></li>
+                                        <li><a seiten_id="punchcard-sorter" href="/en/devices/punchcard-sorter.php">The function of the punch card sorter</a></li>
+                                </ul>
+                        </li>
+                        <li><a href="/en/computer/gamma3.php">Mainframes</a>
+                                <ul class="u3">
                                         <li><a seiten_id="gamma3" href="/en/computer/gamma3.php">BULL GAMMA 3</a></li>
                                         <li><a seiten_id="gamma10" href="/en/computer/gamma10.php">BULL GAMMA 10</a></li>
                                         <li><a seiten_id="gamma55" href="/en/computer/gamma55.php">BULL GAMMA 55 (GE-55)</a></li>
+                                        <li><a seiten_id="ibm1130" href="/en/computer/ibm1130.php">IBM 1130</a></li>
                                         <li><a seiten_id="univac9200" href="/en/computer/univac9200.php">UNIVAC 9200</a></li>
                                         <li><a seiten_id="univac9400" href="/en/computer/univac9400.php">UNIVAC 9400</a>
@@ -72 +87 @@
                                         </li>
                                 </ul>
-                                <ul class="u3 geraete">
-                                        <li><a seiten_id="punchcard-collator" href="/en/devices/punchcard-collator.php">The function of the punch card collator</a></li>
-                                        <li><a seiten_id="punchcard-sorter" href="/en/devices/punchcard-sorter.php">The function of the punch card sorter</a></li>
-                                </ul>
                         </li>
                         <li><a seiten_id="kommerzielle" href="/en/computer/commercial.php">Commercial Computers</a>