harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge upstream, slider work, refactor ping module, language selection work

Browse Source
This commit is contained in:
friendica
2012-07-13 07:09:29 -07:00
parent 599f3d2961
commit a20a637727
42 changed files with 11867 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
view/head.tpl
View File

@@ -5,6 +5,7 @@
<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="$baseurl/library/jslider/bin/jquery.slider.min.css" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
@@ -27,13 +28,7 @@
<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
<script type="text/javascript" src="$baseurl/js/main.js" ></script>
<link href="$baseurl/include/jquery_ui/development-bundle/themes/base/jquery.ui.all.css" rel="stylesheet">
<script src="$baseurl/include/jquery_ui/js/jquery-1.7.2.min.js"></script>
<script src="$baseurl/include/jquery_ui/development-bundle/ui/jquery.ui.core.js"></script>
<script src="$baseurl/include/jquery_ui/development-bundle/ui/jquery.ui.widget.js"></script>
<script src="$baseurl/include/jquery_ui/development-bundle/ui/jquery.ui.mouse.js"></script>
<script src="$baseurl/include/jquery_ui/development-bundle/ui/jquery.ui.slider.js"></script>
<script src="$baseurl/library/jslider/bin/jquery.slider.min.js"></script>
<script>
var updateInterval = $update_interval;

4
view/main_slider.tpl Normal file
View File

@@ -0,0 +1,4 @@
<div id="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="main-range" type="slider" name="closeness" value="0;99" /></div>
<script>
$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '$intimate', '|', '$friends', '|', '$coworkers', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ] });
</script>

11
view/theme/slackr/style.css
View File

@@ -220,3 +220,14 @@ nav #site-location {
-o-transform: rotate(4deg);
}
.jslider .jslider-scale ins {
color: #333;
font-size: 12px;
width: 100px;
text-align: center;
}
#slider {
margin-top: 10px;
margin-bottom: 15px;
}