open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move inline warning styles into CSS, clean up and fix #270

Browse Source
remotes/origin/stable5
Jan-Christoph Borchardt 12 years ago
parent 13e0287b74
commit 56dae06528
2 changed files with 26 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      core/css/styles.css
  2. 6
      core/templates/installation.php

28
core/css/styles.css
Unescape View File

@ -34,7 +34,12 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end
/* INPUTS */
input[type="text"], input[type="password"] { cursor:text; }
input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a { font-size:1em; font-family:Arial, Verdana, sans-serif; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; }
input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
font-size:1em; font-family:Arial, Verdana, sans-serif; width:10em; margin:.3em; padding:.6em .5em .4em;
background:#fff; color:#333; border:1px solid #ddd; outline:none;
-moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset;
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
}
input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; }
input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
@ -42,7 +47,12 @@ input[type="password"]:hover, input[type="password"]:focus, input[type="password
.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
width:auto; padding:.4em;
background:#f8f8f8; font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid #ddd; cursor:pointer;
-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
}
input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; }
input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
input[type="checkbox"] { width:auto; }
@ -77,13 +87,14 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
#login form { width:22em; margin:2em auto 2em; padding:0; }
#login form fieldset { background:0; border:0; margin-bottom:20px; padding:0; }
#login form fieldset { margin-bottom:20px; }
#login form #adminaccount { margin-bottom:5px; }
#login form fieldset legend {
#login form fieldset legend, #datadirContent label {
width:100%; text-align:center;
font-weight:bold; color:#999; text-shadow:0 1px 0 white;
}
#login form fieldset legend a { color:#999; }
#login #datadirContent label { color:#999; display:block; }
#login form #datadirField legend { margin-bottom:15px; }
/* Nicely grouping input field sets */
@ -115,12 +126,19 @@ label.infield { cursor: text !important; }
#login form #selectDbType { text-align:center; }
#login form #selectDbType label {
position:static; margin:0 -3px 5px; padding:.4em;
font-size:12px; font-weight:bold; background:#f8f8f8; color:#555; cursor:pointer;
font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer;
border:1px solid #ddd; text-shadow:#eee 0 1px 0;
-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
}
#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
fieldset.warning {
padding:8px;
color:#b94a48; background-color:#f2dede; border:1px solid #eed3d7;
border-radius:5px;
}
fieldset.warning legend { color:#b94a48 !important; }
/* NAVIGATION ------------------------------------------------------------- */
#navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; overflow:hidden;}

6
core/templates/installation.php
Unescape View File

@ -19,7 +19,7 @@
</ul>
<?php endif; ?>
<?php if(!$_['secureRNG']): ?>
<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7; border-style:solid; border-radius: 5px; border-width:1px; padding:0.5em;">
<fieldset class="warning">
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<span><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?></span>
<br/>
@ -27,7 +27,7 @@
</fieldset>
<?php endif; ?>
<?php if(!$_['htaccessWorking']): ?>
<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7; border-style:solid; border-radius: 5px; border-width:1px; padding:0.5em;">
<fieldset class="warning">
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<span><?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.');?></span>
</fieldset>
@ -47,7 +47,7 @@
<fieldset id="datadirField">
<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> ▾</a></legend>
<div id="datadirContent">
<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label><br/>
<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label>
<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
</div>
</fieldset>

Write Preview
Loading…
Cancel
Save