diff options
Diffstat (limited to 'core/templates')
-rw-r--r-- | core/templates/exception.php | 4 | ||||
-rw-r--r-- | core/templates/installation.php | 44 | ||||
-rw-r--r-- | core/templates/layout.base.php | 3 | ||||
-rw-r--r-- | core/templates/layout.guest.php | 6 | ||||
-rw-r--r-- | core/templates/layout.user.php | 22 | ||||
-rw-r--r-- | core/templates/update.php | 3 |
6 files changed, 55 insertions, 27 deletions
diff --git a/core/templates/exception.php b/core/templates/exception.php index 62d6cf2ade5..4059c7e047d 100644 --- a/core/templates/exception.php +++ b/core/templates/exception.php @@ -5,7 +5,9 @@ <p class="exception"> <?php if($_['showsysinfo'] == true) { - echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>, please copy the following informations into the description. <br><br><textarea readonly>'; + echo 'If you would like to support ownCloud\'s developers and' + .' report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>,' + .' please copy the following informations into the description. <br><br><textarea readonly>'; echo 'Message: ' . $_['message'] . "\n"; echo 'Error Code: ' . $_['code'] . "\n"; echo 'File: ' . $_['file'] . "\n"; diff --git a/core/templates/installation.php b/core/templates/installation.php index b3b7cfc4b8b..c48d2f764e7 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -22,7 +22,7 @@ <fieldset class="warning"> <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> <p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/> - <?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p> + <?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p> </fieldset> <?php endif; ?> <?php if(!$_['htaccessWorking']): ?> @@ -35,12 +35,14 @@ <fieldset id="adminaccount"> <legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend> <p class="infield grouptop"> - <input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required /> + <input type="text" name="adminlogin" id="adminlogin" + value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required /> <label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label> <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" /> </p> <p class="infield groupbottom"> - <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" /> + <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" + value="<?php print OC_Helper::init_var('adminpass'); ?>" /> <label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label> <img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" /> <input type="checkbox" id="show" name="show" /> @@ -49,15 +51,17 @@ </fieldset> <fieldset id="datadirField"> - <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/triangle-s.svg'); ?>" /></a></legend> + <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/caret-dark.svg'); ?>" /></a></legend> <div id="datadirContent"> <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']); ?>" /> + <input type="text" name="directory" id="directory" + value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" /> </div> </fieldset> <fieldset id='databaseField'> - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> + <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) + $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> <legend><?php echo $l->t( 'Configure the database' ); ?></legend> <div id="selectDbType"> <?php if($_['hasSQLite']): ?> @@ -66,7 +70,8 @@ <p>SQLite <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="sqlite" /> <?php else: ?> - <input type="radio" name="dbtype" value="sqlite" id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value="sqlite" id="sqlite" + <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/> <label class="sqlite" for="sqlite">SQLite</label> <?php endif; ?> <?php endif; ?> @@ -77,7 +82,8 @@ <p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="mysql" /> <?php else: ?> - <input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value="mysql" id="mysql" + <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/> <label class="mysql" for="mysql">MySQL</label> <?php endif; ?> <?php endif; ?> @@ -88,7 +94,8 @@ <input type="hidden" id="dbtype" name="dbtype" value="pgsql" /> <?php else: ?> <label class="pgsql" for="pgsql">PostgreSQL</label> - <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value='pgsql' id="pgsql" + <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> @@ -98,7 +105,8 @@ <input type="hidden" id="dbtype" name="dbtype" value="oci" /> <?php else: ?> <label class="oci" for="oci">Oracle</label> - <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value='oci' id="oci" + <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> </div> @@ -107,15 +115,19 @@ <div id="use_other_db"> <p class="infield grouptop"> <label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label> - <input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" /> + <input type="text" name="dbuser" id="dbuser" + value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" /> </p> <p class="infield groupmiddle"> <label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label> - <input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" /> + <input type="password" name="dbpass" id="dbpass" + value="<?php print OC_Helper::init_var('dbpass'); ?>" /> </p> <p class="infield groupmiddle"> <label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label> - <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> + <input type="text" name="dbname" id="dbname" + value="<?php print OC_Helper::init_var('dbname'); ?>" + autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> </p> </div> <?php endif; ?> @@ -123,13 +135,15 @@ <div id="use_oracle_db"> <p class="infield groupmiddle"> <label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label> - <input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" /> + <input type="text" name="dbtablespace" id="dbtablespace" + value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" /> </p> </div> <?php endif; ?> <p class="infield groupbottom"> <label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label> - <input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /> + <input type="text" name="dbhost" id="dbhost" + value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /> </p> </fieldset> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 2049bcb36da..4233fd8300e 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -3,7 +3,8 @@ <head> <title>ownCloud</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 69330aa9fce..b26020b766b 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,7 +4,8 @@ <title>ownCloud</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> - <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> @@ -30,6 +31,7 @@ </div></header> <?php echo $_['content']; ?> </div> - <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – <?php echo $l->t( 'web services under your control' ); ?></p></footer> + <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – + <?php echo $l->t( 'web services under your control' ); ?></p></footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2d00bdb5c8e..d0869cb8404 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -1,10 +1,12 @@ <!DOCTYPE html> <html> <head> - <title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title> + <title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud + <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> - <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> @@ -27,7 +29,8 @@ <div id="notification"></div> </div> <header><div id="header"> - <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> + <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" + src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <ul id="settings" class="svg"> <span id="expand"> @@ -37,7 +40,8 @@ <div id="expanddiv"> <?php foreach($_['settingsnavigation'] as $entry):?> <li> - <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> + <a href="<?php echo $entry['href']; ?>" title="" + <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> <img class="svg" alt="" src="<?php echo $entry['icon']; ?>"> <?php echo $entry['name'] ?> </a> @@ -45,14 +49,17 @@ <?php endforeach; ?> <li> <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"> - <img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> <?php echo $l->t('Log out');?> + <img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> + <?php echo $l->t('Log out');?> </a> </li> </div> </ul> <form class="searchbox" action="#" method="post"> - <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech /> + <input id="searchbox" class="svg" type="search" name="query" + value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" + autocomplete="off" x-webkit-speech /> </form> </div></header> @@ -60,7 +67,8 @@ <ul id="apps" class="svg"> <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php echo $entry['id']; ?>"> - <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> + <a href="<?php echo $entry['href']; ?>" title="" + <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> <img class="icon svg" src="<?php echo $entry['icon']; ?>"/> <?php echo $entry['name']; ?> </a> diff --git a/core/templates/update.php b/core/templates/update.php index ae714dcfb92..685a5536d06 100644 --- a/core/templates/update.php +++ b/core/templates/update.php @@ -1,5 +1,6 @@ <ul> <li class='update'> - <?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br /> + <?php echo $l->t('Updating ownCloud to version %s, this may take a while.', + array($_['version'])); ?><br /><br /> </li> </ul> |