Browse Source

Merge branch 'master' into development

pull/24/head
Teknikode 8 years ago
parent
commit
e8124d2897
  1. 2
      includes/common.php
  2. 2
      includes/update_profile.php
  3. 4
      templates/default/js/profile.js
  4. 2
      templates/default/js/stats.js

2
includes/common.php

@ -48,7 +48,7 @@ function extract_subdomains($domain) @@ -48,7 +48,7 @@ function extract_subdomains($domain)
function get_subdomain($CONF)
{
$sub = extract_subdomains($_SERVER['HTTP_HOST']);
if ($sub == "")
if ($sub == "" || $sub == "www")
{
$sub = $CONF['default_page'];
}

2
includes/update_profile.php

@ -171,7 +171,7 @@ if(isset($_POST)) @@ -171,7 +171,7 @@ if(isset($_POST))
}
}
$repo->add('.');
$repo->commit('Modified keys for '.$user->username);
$repo->commit('Modified '.$index.' keys for '.$user->username);
$repo->push('origin', 'master');
}

4
templates/default/js/profile.js

@ -28,7 +28,7 @@ $(document).ready(function() { @@ -28,7 +28,7 @@ $(document).ready(function() {
});
$("#add_public_key").click(function() {
bootbox.prompt("Enter your Public Key (including ssh-rsa)", function(result) {
bootbox.prompt("Enter your Public Key [ie: ssh-rsa (.*)]", function(result) {
if (result)
{
prev_keys = $("#update_public_key").val();
@ -65,7 +65,7 @@ $(document).ready(function() { @@ -65,7 +65,7 @@ $(document).ready(function() {
$("#update_submit").click(function(){
// Start Updating Animation
$.blockUI({ message: '<div class="text-center"><h3>Working...</h3></div>' });
$.blockUI({ message: '<div class="text-center"><h3>Updating...</h3></div>' });
current_password=encodeURIComponent($("#update_password_current").val());
password=encodeURIComponent($("#update_password").val());

2
templates/default/js/stats.js

@ -135,7 +135,7 @@ function renderMemory(data) { @@ -135,7 +135,7 @@ function renderMemory(data) {
},
Usage: {
html: function () {
if (this["Details"] == undefined) {
if (this["Details"] == undefined || this["Details"].length <= 0) {
return '<div class="progress">' +
'<div class="progress-bar progress-bar-info" style="width: ' + this["Percent"] + '%;"></div>' +
'</div><div class="percent">' + this["Percent"] + '%</div>';

Loading…
Cancel
Save