Project

General

Profile

« Previous | Next » 

Revision 8bade64c

Added by Vinicius Coque over 14 years ago

Revert "Add gettext calls on main menu"

This reverts commit 67f0f0a772722d418f0f660bf2b16ff5b4c94fd5.

system_firmware.php shouldn't be commited

View differences:

usr/local/www/fbegin.inc
308 308
			<div id="navigation" style="z-index:1000">
309 309
				<ul id="menu">
310 310
					<li class="firstdrop">
311
						<div><?php echo gettext("System"); ?></div>
311
						<div>System</div>
312 312
						<ul class="subdrop">
313 313
						<?php
314 314
							output_menu($system_menu);
......
316 316
						</ul>
317 317
					</li>
318 318
					<li class="drop">
319
						<div><?php echo gettext("Interfaces"); ?></div>
319
						<div>Interfaces</div>
320 320
						<ul class="subdrop">
321 321
						<?php
322 322
							output_menu($interfaces_menu);
......
324 324
						</ul>
325 325
					</li>
326 326
					<li class="drop">
327
						<div><?php echo gettext("Firewall"); ?></div>
327
						<div>Firewall</div>
328 328
						<ul class="subdrop">
329 329
						<?php
330 330
							output_menu($firewall_menu);
......
332 332
						</ul>
333 333
					</li>
334 334
					<li class="drop">
335
						<div><?php echo gettext("Services"); ?></div>
335
						<div>Services</div>
336 336
						<ul class="subdrop">
337 337
						<?
338 338
							output_menu($services_menu);
......
340 340
						</ul>
341 341
					</li>
342 342
					<li class="drop">
343
						<div><?php echo gettext("VPN"); ?></div>
343
						<div>VPN</div>
344 344
						<ul class="subdrop">
345 345
						<?php
346 346
							output_menu($vpn_menu);
......
348 348
						</ul>
349 349
					</li>
350 350
					<li class="drop">
351
						<div><?php echo gettext("Status"); ?></div>
351
						<div>Status</div>
352 352
						<ul class="subdrop">
353 353
						<?php
354 354
							output_menu($status_menu);
......
356 356
						</ul>
357 357
					</li>
358 358
					<li class="drop">
359
						<div><?php echo gettext("Diagnostics"); ?></div>
359
						<div>Diagnostics</div>
360 360
						<ul id="diag" class="subdrop">
361 361
						<?
362 362
							output_menu($diagnostics_menu);
......
365 365
					</li>
366 366
					<?php if(! $g['disablehelpmenu']): ?>
367 367
					<li class="lastdrop">
368
						<div><?php echo gettext("Help"); ?></div>
368
						<div>Help</div>
369 369
						<ul id="help" class="subdrop">
370 370
						<?
371 371
							output_menu($help_menu, "_new");
usr/local/www/system_firmware.php
124 124
	unset($input_errors);
125 125
	unset($sig_warning);
126 126

  
127
	if ($_POST['Enable'])
127
	if (stristr($_POST['Submit'], gettext("Enable")))
128 128
		$mode = "enable";
129
	else if ($_POST['Disable'])
129
	else if (stristr($_POST['Submit'], gettext("Disable")))
130 130
		$mode = "disable";
131
	else if ($_POST['Upgrade'] || $_POST['sig_override'])
131
	else if (stristr($_POST['Submit'], gettext("Upgrade")) || $_POST['sig_override'])
132 132
		$mode = "upgrade";
133 133
	else if ($_POST['sig_no']) {
134 134
		if(file_exists("{$g['upload_path']}/firmware.tgz"))
......
257 257
						</p>
258 258
						<?php if (!is_subsystem_dirty('rebootreq')): ?>
259 259
						<?php if (!is_subsystem_dirty('firmware')): ?>
260
							<input name="Enable" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>">
260
							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>">
261 261
						<?php else: ?>
262
							<input name="Disable" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>">
262
				  			<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>">
263 263
							<br><br>
264 264
							<strong><?=gettext("Firmware image file:");?> </strong>&nbsp;
265 265
							<input name="ulfile" type="file" class="formfld">
......
289 289
								<input name="Submit" type="submit" class="formbtn" value="Upgrade firmware" onClick="window.open('upload_progress.php?upload_id=<?=$upload_id?>','UploadMeter','width=370,height=115', true); return true;">
290 290
								*/
291 291
							?>
292
							<input name="Upgrade" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>">
292
							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>">
293 293
						<?php endif; else: ?>
294 294
							<strong><?=gettext("You must reboot the system before you can upgrade the firmware.");?></strong>
295 295
						<?php endif; ?>

Also available in: Unified diff