deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed naming (phpci -> php-censor)

Browse source
This commit is contained in:
Dmitry Khomutov 2016-07-21 23:02:11 +06:00
commit 31f92327c1
76 changed files with 357 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/PHPCensor/View/BuildStatus/view.phtml
View file

@ -20,7 +20,7 @@
<script src="<?php echo APP_URL ?>assets/js/bootstrap.min.js"></script>
<script src="<?php echo APP_URL ?>assets/js/jqueryui.js"></script>
<script src="<?php echo APP_URL ?>assets/js/class.js"></script>
<script src="<?php echo APP_URL ?>assets/js/phpci.js"></script>
<script src="<?php echo APP_URL ?>assets/js/app.js"></script>
<script src="<?php echo APP_URL ?>assets/js/init.js"></script>
</head>
<body>

2
src/PHPCensor/View/BuildsTable.phtml
View file

@ -78,7 +78,7 @@ switch($build->getStatus())
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="<?php echo APP_URL ?>build/delete/<?php print $build->getId(); ?>" class="phpci-app-delete-build"><?php Lang::out('delete_build'); ?></a></li>
<li><a href="<?php echo APP_URL ?>build/delete/<?php print $build->getId(); ?>" class="app-delete-build"><?php Lang::out('delete_build'); ?></a></li>
</ul>
<?php endif; ?>
</div>

2
src/PHPCensor/View/ProjectForm.phtml
View file

@ -31,7 +31,7 @@
window.return_url = <?php print json_encode((empty($_SERVER['HTTPS']) ? 'http' : 'https') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); ?>;
<?php
$gh = \b8\Config::getInstance()->get('phpci.github', null);
$gh = \b8\Config::getInstance()->get('php-censor.github', null);
if($gh) {
print 'window.github_app_id = ' . json_encode($gh['id']) . ';' . PHP_EOL;

6
src/PHPCensor/View/Session.phtml
View file

@ -2,7 +2,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title><?php Lang::out('log_in_to_phpci'); ?></title>
<title><?php Lang::out('log_in_to_app'); ?></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -38,7 +38,7 @@
width: 350px;
}
#phpci-logo img {
#logo img {
margin-bottom: 30px;
}
@ -47,7 +47,7 @@
<body>
<div class="container">
<div class="row" style="margin-top: 10%; text-align: center">
<a id="phpci-logo" href="/">
<a id="logo" href="/">
<img src="<?php print APP_URL; ?>assets/img/php-censor-logo.png">
</a>
<div class="" id="login-box">

12
src/PHPCensor/View/Settings/index.phtml
View file

@ -52,21 +52,21 @@
<?php
$id = null;
if (isset($settings['phpci']['github']['id'])) {
$id = $settings['phpci']['github']['id'];
if (isset($settings['php-censor']['github']['id'])) {
$id = $settings['php-censor']['github']['id'];
}
$returnTo = APP_URL . 'settings/github-callback';
$githubUri = 'https://github.com/login/oauth/authorize?client_id='.$id.'&scope=repo&redirect_uri=' . $returnTo;
?>
<?php if (!empty($id)): ?>
<?php if (empty($githubUser['name']) || empty($settings['phpci']['github']['token'])): ?>
<?php if (empty($githubUser['name']) || empty($settings['php-censor']['github']['token'])): ?>
<p class="alert alert-warning clearfix">
<?php Lang::out('github_sign_in', $githubUri); ?>
</p>
<?php else: ?>
<p class="alert alert-success">
<?php Lang::out('github_phpci_linked'); ?>
<?php Lang::out('github_app_linked'); ?>
<strong>
<a href="<?php echo $githubUser['html_url']; ?>"><?php echo $githubUser['name']; ?></a>
@ -105,7 +105,7 @@
</div>
<div class="box-body clearfix">
<?php if (!isset($settings['phpci']['email_settings'])): ?>
<?php if (!isset($settings['php-censor']['email_settings'])): ?>
<p class="alert alert-warning clearfix">
<?php Lang::out('email_settings_help'); ?>
</p>
@ -123,7 +123,7 @@
<div class="box-body clearfix">
<p class="alert alert-warning clearfix">
Be careful: This setting disables authentication and uses your current admin account for all actions within phpci with admin rights.
Be careful: This setting disables authentication and uses your current admin account for all actions within PHP Censor with admin rights.
</p>
<?php print $authenticationSettings; ?>

2
src/PHPCensor/View/User/index.phtml
View file

@ -46,7 +46,7 @@
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="<?php echo APP_URL ?>user/delete/<?php print $user->getId(); ?>" class="phpci-app-delete-user"><?php Lang::out('delete_user'); ?></a></li>
<li><a href="<?php echo APP_URL ?>user/delete/<?php print $user->getId(); ?>" class="app-delete-user"><?php Lang::out('delete_user'); ?></a></li>
</ul>
</div>
<?php endif; ?>

18
src/PHPCensor/View/layout.phtml
View file

@ -34,19 +34,19 @@
<script src="<?php print APP_URL; ?>assets/js/class.js"></script>
<script src="<?php print APP_URL; ?>assets/js/sprintf.js"></script>
<script src="<?php print APP_URL; ?>assets/js/moment.min.js"></script>
<script src="<?php print APP_URL; ?>assets/js/phpci.js" type="text/javascript"></script>
<script src="<?php print APP_URL; ?>assets/js/app.js" type="text/javascript"></script>
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body class="phpci <?php print !empty($skin) ? 'skin-' . $skin : 'skin-blue'; ?>">
<body class="app-layout <?php print !empty($skin) ? 'skin-' . $skin : 'skin-blue'; ?>">
<div class="wrapper row-offcanvas row-offcanvas-left">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="<?php print APP_URL; ?>" class="logo">PHPCI</a>
<a href="<?php print APP_URL; ?>" class="logo">PHP Censor</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
@ -59,29 +59,29 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li class="dropdown messages-menu phpci-pending">
<li class="dropdown messages-menu app-pending">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-clock-o"></i>
<span class="label label-info phpci-pending-count"></span>
<span class="label label-info app-pending-count"></span>
</a>
<ul class="dropdown-menu">
<li class="header"><?php Lang::out('n_builds_pending', 0); ?></li>
<li>
<ul class="menu phpci-pending-list">
<ul class="menu app-pending-list">
</ul>
</li>
</ul>
</li>
<li class="dropdown messages-menu phpci-running">
<li class="dropdown messages-menu app-running">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-cogs"></i>
<span class="label label-warning phpci-running-count"></span>
<span class="label label-warning app-running-count"></span>
</a>
<ul class="dropdown-menu">
<li class="header"><?php Lang::out('n_builds_running', 0); ?></li>
<li>
<ul class="menu phpci-running-list">
<ul class="menu app-running-list">
</ul>
</li>
</ul>