Skip to content

Commit 59204b4

Browse files
HugoFaraHugoFara
committed
More relying on flexbox styling.
1 parent be53bd8 commit 59204b4

6 files changed

Lines changed: 93 additions & 74 deletions

File tree

‎css/styles.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎display_impr_text_header.php‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,29 +115,34 @@ function do_show_a() {
115115
function do_diplay_impr_text_header_content($title, $textid, $audio, $sourceURI)
116116
{
117117
?>
118-
<h2 class="center" style="margin:5px;margin-top:-10px;">
119-
<img id="hidet" style="margin-bottom:-5px;" class="click" src="icn/light-bulb-T.png" title="Toggle Text Display (Now ON)" alt="Toggle Text Display (Now ON)" onclick="do_hide_t();" />
120-
<img id="showt" style="display:none; margin-bottom:-5px;" class="click" src="icn/light-bulb-off-T.png" title="Toggle Text Display (Now OFF)" alt="Toggle Text Display (Now OFF)" onclick="do_show_t();" />
121-
<img id="hide" style="margin-bottom:-5px;" class="click" src="icn/light-bulb-A.png" title="Toggle Annotation Display (Now ON)" alt="Toggle Annotation Display (Now ON)" onclick="do_hide_a();" />
122-
<img id="show" style="display:none; margin-bottom:-5px;" class="click" src="icn/light-bulb-off-A.png" title="Toggle Annotation Display (Now OFF)" alt="Toggle Annotation Display (Now OFF)" onclick="do_show_a();" />
123-
&nbsp; &nbsp;
124-
<?php
125-
echo tohtml($title);
126-
if (isset($sourceURI)) {
127-
echo ' <a href="' . $sourceURI . '">
128-
<img src="'.get_file_path('icn/chain.png').'" title="Text Source" alt="Text Source" />
129-
</a>';
130-
}
131-
echo getPreviousAndNextTextLinks($textid, 'display_impr_text.php?text=', true, ' &nbsp; &nbsp; ');
118+
<h1><?php echo tohtml($title); ?></h1>
119+
<div class="flex-spaced">
120+
<div>
121+
<img id="hidet" class="click" src="icn/light-bulb-T.png"
122+
title="Toggle Text Display (Now ON)" alt="Toggle Text Display (Now ON)" onclick="do_hide_t();" />
123+
<img id="showt" style="display:none;" class="click" src="icn/light-bulb-off-T.png"
124+
title="Toggle Text Display (Now OFF)" alt="Toggle Text Display (Now OFF)" onclick="do_show_t();" />
125+
<img id="hide" class="click" src="icn/light-bulb-A.png"
126+
title="Toggle Annotation Display (Now ON)" alt="Toggle Annotation Display (Now ON)" onclick="do_hide_a();" />
127+
<img id="show" style="display:none;" class="click" src="icn/light-bulb-off-A.png"
128+
title="Toggle Annotation Display (Now OFF)" alt="Toggle Annotation Display (Now OFF)" onclick="do_show_a();" />
129+
</div>
130+
<div>
131+
<?php
132+
if (isset($sourceURI)) {
133+
echo ' <a href="' . $sourceURI . '">
134+
<img src="'.get_file_path('icn/chain.png').'" title="Text Source" alt="Text Source" />
135+
</a>';
136+
}
137+
echo getPreviousAndNextTextLinks($textid, 'display_impr_text.php?text=', true, ' &nbsp; &nbsp; ');
132138
?>
133-
<img class="click" src="icn/cross.png" title="Close Window" alt="Close Window" onclick="top.close();" />
134-
</h2>
139+
</div>
140+
<div>
141+
<img class="click" src="icn/cross.png" title="Close Window" alt="Close Window" onclick="top.close();" />
142+
</div>
143+
</div>
135144
<?php
136145
makeMediaPlayer($audio);
137-
138-
echo '</table>';
139-
140-
//pageend();
141146
}
142147

143148
/**

‎do_test_header.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function do_test_header_content($title, $p, $totalcountdue, $totalcount, $langua
220220
<?php echo tohtml($title)
221221
. ' (Due: ' . $totalcountdue . ' of ' . $totalcount . ')'; ?>
222222
</h1>
223-
<div class="flex-header">
223+
<div class="flex-spaced">
224224
<div>
225225
<input type="button" value="..[<?php echo $language; ?>].."
226226
onclick="startWordTest(1, '<?php echo $p; ?>')" />

‎do_text_header.php‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,26 @@ function do_settings($textid): void
136136
$showLearning = getSettingZeroOrOne('showlearningtranslations', 1);
137137

138138
?>
139-
<table class="width99pc">
140-
<tr>
141-
<td>TO DO:
142-
<span id="learnstatus"><?php echo texttodocount2($textid); ?></span>
143-
</td>
144-
<td
145-
title="[Show All] = ON: ALL terms are shown, and all multi-word terms are shown as superscripts before the first word. The superscript indicates the number of words in the multi-word term.
139+
<div class="flex-spaced">
140+
<div>
141+
TO DO:
142+
<span id="learnstatus"><?php echo texttodocount2($textid); ?></span>
143+
</div>
144+
<div
145+
title="[Show All] = ON: ALL terms are shown, and all multi-word terms are shown as superscripts before the first word. The superscript indicates the number of words in the multi-word term.
146146
[Show All] = OFF: Multi-word terms now hide single words and shorter or overlapping multi-word terms.">
147-
Show All&nbsp;
148-
<input type="checkbox" id="showallwords" <?php echo get_checked($showAll); ?> onclick="showAllwordsClick();" />
149-
</td>
150-
<td
151-
title="[Learning Translations] = ON: Terms with Learning Level&nbsp;1 display their translations under the term.
147+
Show All&nbsp;
148+
<input type="checkbox" id="showallwords" <?php echo get_checked($showAll); ?> onclick="showAllwordsClick();" />
149+
</div>
150+
<div
151+
title="[Learning Translations] = ON: Terms with Learning Level&nbsp;1 display their translations under the term.
152152
[Learning Translations] = OFF: No translations are shown in the reading mode.">
153-
Learning Translations&nbsp;
154-
<input type="checkbox" id="showlearningtranslations" <?php echo get_checked($showLearning); ?> onclick="showAllwordsClick();" />
155-
</td>
156-
<td id="thetextid" class="hide"><?php echo $textid; ?></td>
157-
<td><button id="readTextButton">Read in browser</button></td>
158-
</tr>
159-
</table>
153+
Learning Translations&nbsp;
154+
<input type="checkbox" id="showlearningtranslations" <?php echo get_checked($showLearning); ?> onclick="showAllwordsClick();" />
155+
</div>
156+
<div id="thetextid" class="hide"><?php echo $textid; ?></div>
157+
<div><button id="readTextButton">Read in browser</button></div>
158+
</div>
160159
<?php
161160
}
162161

0 commit comments

Comments
 (0)