diff options
| author | friendica <info@friendica.com> | 2012-07-13 07:09:29 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-13 07:09:29 -0700 |
| commit | a20a6377277a985fa596b0ea460d91b97f79b4a5 (patch) | |
| tree | 1878d488143e2f0d698dc42ae924ab7be93ffb54 /view | |
| parent | 599f3d29610b2cc509ab51df0f42d154dd70278d (diff) | |
| download | volse-hubzilla-a20a6377277a985fa596b0ea460d91b97f79b4a5.tar.gz volse-hubzilla-a20a6377277a985fa596b0ea460d91b97f79b4a5.tar.bz2 volse-hubzilla-a20a6377277a985fa596b0ea460d91b97f79b4a5.zip | |
merge upstream, slider work, refactor ping module, language selection work
Diffstat (limited to 'view')
| -rw-r--r-- | view/head.tpl | 9 | ||||
| -rw-r--r-- | view/main_slider.tpl | 4 | ||||
| -rw-r--r-- | view/theme/slackr/style.css | 11 |
3 files changed, 17 insertions, 7 deletions
diff --git a/view/head.tpl b/view/head.tpl index 3d8943448..d7fb1e5b7 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -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; diff --git a/view/main_slider.tpl b/view/main_slider.tpl new file mode 100644 index 000000000..7d03beeb1 --- /dev/null +++ b/view/main_slider.tpl @@ -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> diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index df9b67ef0..3040775ec 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -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; +}
\ No newline at end of file |