Changeset 415 in t29-www


Ignore:
Timestamp:
May 23, 2013, 12:24:38 PM (6 years ago)
Author:
heribert
Message:

Konflikt aufgelöst.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • de/index.php

    r412 r415  
    9393<div class="leftcol">
    9494        <h3>Führungen</h3>
    95 <div class="box termin clear-after">
    96                 <p class="date left"><em>2013</em> 22. Mai</em></p>
    97                 <h4>Die Geschichte der Kommunikation</h4>
    98                
    99                 Pestalozzi-Schule
    100                
    101                 <dl class="daten">
    102                         <dt>Termin</dt>
    103                         <dd class="termin">Mittwoch, 22. Mai um 15 Uhr</dd>
    104                 </dl>
    105         </div>
     95
    10696        <div class="box termin clear-after">
    10797                <p class="date left"><em>2013</em> 03. Juni</em></p>
     
    217207<div class="center button-box">
    218208        <a href="#archiv" class="go archiv-btn">Vergangene Termine anzeigen</a>
    219         &middot; <a href="/de/anmeldung.php" class="anmeldung-btn">Zu Führung anmelden</a>
     209        <!--
     210        &middot; <a href="/de/anmeldung.php" class="anmeldung-btn">Zu Führung anmelden</a> -->
    220211</div>
    221212
    222213<div class="archiv clear" style="display: none;">
    223214<h2>Termin-Archiv</h2>
     215
     216<div class="box termin only clear-after">
     217                <p class="date left"><em>2013</em> 22. Mai</em></p>
     218                <h4>Die Geschichte der Kommunikation</h4>
     219               
     220                Pestalozzi-Schule
     221               
     222                <dl class="daten">
     223                        <dt>Termin</dt>
     224                        <dd class="termin">Mittwoch, 22. Mai um 15 Uhr</dd>
     225                </dl>
     226        </div>
     227
    224228
    225229        <div class="box termin clear-after">
  • en/computer/storage-media.php

    r373 r415  
    4040               
    4141        <div class="box left clear-after nomargin-bottom">
    42 <img src="/shared/photos/rechnertechnik/speichermedien/speicherausschnitt.jpg" alt="Details des Laufzeitspeicherfotos" style="margin-left: 6px;" width="225" height="405" />
    43 <p class="bildtext"><b>Cutout. The LC elements can be clearly seen.</b></p>
     42                <img src="/shared/photos/rechnertechnik/speichermedien/speicherausschnitt.jpg" alt="Details des Laufzeitspeicherfotos" style="margin-left: 6px;" width="225" height="405" />
     43                <p class="bildtext"><b>Cutout. The LC elements can be clearly seen.</b></p>
     44
    4445    <p>
    4546        One of these solutions is the so called delay line memory.
     
    5354        integer with only 12 digits. Obviously storage was very expensive in the early
    5455        times of computing.</p>
     56        </div><!-- end of details laufzeitspeicherfoto-Box -->
    5557
    56         </div><!-- end of details laufzeitspeicherfoto-Box -->
    57        
    5858               
    5959 
Note: See TracChangeset for help on using the changeset viewer.
© 2008 - 2013 technikum29 • Sven Köppel • Some rights reserved
Powered by Trac
Expect where otherwise noted, content on this site is licensed under a Creative Commons 3.0 License