friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Redesign prototype merge #18

Merged
MrPetovan merged 50 commits from feature/redesign-prototype into master 2017-05-06 08:10:18 +02:00
Conversation 0 Commits 50 Files changed 234 +18 -41
24 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 12e4bff880 - Show all commits

2
include/Photo.php
View file

@ -186,5 +186,3 @@ class Photo {
}
}
}}

1
include/Scrape.php
View file

@ -191,4 +191,3 @@ function pop_scrape_target(&$array, $name) {
unset($array[$at]);
return count($array);
}}

2
include/auth.php
View file

@ -72,5 +72,3 @@ function init_groups_visitor($contact_id) {
}
return $groups;
}}

2
include/cron_maintain.php
View file

@ -111,4 +111,4 @@
$time = time() - $start_maintain;
if($verbose) echo("Maintenance completed. Took $time seconds.".PHP_EOL);
logger("Maintenance completed. Took $time seconds.");
}
}

1
include/dba.php
View file

@ -161,4 +161,3 @@ function closedb() {
global $db;
// $db->close();
}}

1
include/directory.php
View file

@ -25,4 +25,3 @@
fetch_url($dir . '?url=' . bin2hex($argv[1]));
exit;

1
include/items.php
View file

@ -241,4 +241,3 @@ function post_remote($a,$arr) {
return $current_post;
}

1
include/notifier.php
View file

@ -309,4 +309,3 @@
}
killme();

5
include/poller.php
View file

@ -266,8 +266,5 @@
);
}
killme();

1
include/rockstar.php
View file

@ -163,4 +163,3 @@
}
killme();

2
include/submit.php
View file

@ -269,4 +269,4 @@ function nuke_record($url) {
}
}
return;
}
}

2
include/sync.php
View file

@ -437,4 +437,4 @@ function run_pulling_job($a, $pull_batch, $db_host, $db_user, $db_pass, $db_data
}
}
}

2
include/system_unavailable.php
View file

@ -3,4 +3,4 @@
<body>
Apologies but this site is unavailable at the moment. Please try again later.
</body>
</html>
</html>

2
include/ajaxupload.js → js/ajaxupload.js
View file

@ -689,4 +689,4 @@
this._createInput();
}
};
})();
})();

0
include/country.js → js/country.js
View file

0
include/g.line-min.js → js/g.line-min.js vendored
View file

0
include/g.raphael.js → js/g.raphael.js
View file

0
include/jquery-1.4.2.min.js → js/jquery-1.4.2.min.js vendored
View file

0
include/jquery.js → js/jquery.js vendored
View file

1
include/main.js → js/main.js
View file

@ -30,4 +30,3 @@
closeMenu("comment-edit-submit-wrapper-" + id);
}
}

0
include/raphael.js → js/raphael.js
View file

12
mod/health.php
View file

@ -202,9 +202,9 @@ function health_details($a, $id)
);
if(count($r)){
//Include graphael line charts.
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.line-min.js"></script>';
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.line-min.js"></script>';
$speeds = array();
$times = array();
$mintime = time();
@ -249,9 +249,9 @@ function health_details($a, $id)
);
if($r && count($r)){
//Include graphael line charts.
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.line-min.js"></script>';
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.line-min.js"></script>';
$speeds = array();
$times = array();
$mintime = time();

10
view/#head.tpl#
View file

@ -1,10 +0,0 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="$baseurl" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>

11
view/head.tpl
View file

@ -3,13 +3,14 @@
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<!--[if IE]>
<!--
@TODO Dead file
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
//-->
<![endif]-->
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="shortcut icon" href="images/friendica-32.png" />
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script type="text/javascript" src="js/jquery.js" ></script>
<script type="text/javascript" src="js/main.js" ></script>
<link rel="search" type="application/opensearchdescription+xml" title="Friendica Global Directory" href="$baseurl/opensearch" />