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

5 files changed, 56 insertions, 0 deletions

diff --git a/library/jslider/css/jslider.blue.css b/library/jslider/css/jslider.blue.css
new file mode 100644
index 000000000..ae378433c
--- /dev/null
+++ b/library/jslider/css/jslider.blue.css
@@ -0,0 +1,4 @@
+
+  .jslider_blue .jslider-bg i,
+  .jslider_blue .jslider-pointer { background-image: url(../img/jslider.blue.png); }
+  
\ No newline at end of file
diff --git a/library/jslider/css/jslider.css b/library/jslider/css/jslider.css
new file mode 100644
index 000000000..c982e1306
--- /dev/null
+++ b/library/jslider/css/jslider.css
@@ -0,0 +1,39 @@
+
+  .jslider .jslider-bg i,
+  .jslider .jslider-pointer { background: url(../img/jslider.png) no-repeat 0 0; }
+
+  .jslider { display: block; width: 100%; height: 1em; position: relative; top: 0.6em; font-family: Arial, sans-serif; }
+  .jslider table { width: 100%; border-collapse: collapse; border: 0; }
+  .jslider td, .jslider th { padding: 0; vertical-align: top; text-align: left; border: 0; }
+
+  .jslider table,
+  .jslider table tr,
+  .jslider table tr td { width: 100%; vertical-align: top; }
+
+  .jslider .jslider-bg { position: relative; }
+  .jslider .jslider-bg i { height: 5px; position: absolute; font-size: 0; top: 0; }
+  .jslider .jslider-bg .l { width: 50%; background-position: 0 0; left: 0; }
+  .jslider .jslider-bg .r { width: 50%; left: 50%; background-position: right 0; }
+  .jslider .jslider-bg .v { position: absolute; width: 60%; left: 20%; top: 0; height: 5px; background-position: 0 -20px; }
+
+  .jslider .jslider-pointer { width: 13px; height: 15px; background-position: 0 -40px; position: absolute; left: 20%; top: -4px; margin-left: -6px; cursor: pointer; cursor: hand; }
+  .jslider .jslider-pointer-hover { background-position: -20px -40px; }
+  .jslider .jslider-pointer-to { left: 80%; }
+
+  .jslider .jslider-label { font-size: 9px; line-height: 12px; color: black; opacity: 0.4; white-space: nowrap; padding: 0px 2px; position: absolute; top: -18px; left: 0px; }
+  .jslider .jslider-label-to { left: auto; right: 0; }
+
+  .jslider .jslider-value { font-size: 9px; white-space: nowrap; padding: 1px 2px 0; position: absolute; top: -19px; left: 20%; background: white; line-height: 12px; -moz-border-radius: 2px; -webkit-border-radius: 2px; -o-border-radius: 2px; border-radius: 2px; }
+  .jslider .jslider-value-to { left: 80%; }
+
+  .jslider .jslider-label small,
+  .jslider .jslider-value small { position: relative; top: -0.4em; }
+
+  .jslider .jslider-scale { position: relative; top: 9px; }
+  .jslider .jslider-scale span { position: absolute; height: 5px; border-left: 1px solid #999; font-size: 0; }
+  .jslider .jslider-scale ins { font-size: 9px; text-decoration: none; position: absolute; left: 0px; top: 5px; color: #999; }
+
+  .jslider-single .jslider-pointer-to,
+  .jslider-single .jslider-value-to,
+  .jslider-single .jslider-bg .v,
+  .jslider-limitless .jslider-label { display: none; }
diff --git a/library/jslider/css/jslider.plastic.css b/library/jslider/css/jslider.plastic.css
new file mode 100644
index 000000000..32b54676b
--- /dev/null
+++ b/library/jslider/css/jslider.plastic.css
@@ -0,0 +1,3 @@
+
+  .jslider_plastic .jslider-bg i,
+  .jslider_plastic .jslider-pointer { background-image: url(../img/jslider.plastic.png); }
diff --git a/library/jslider/css/jslider.round.css b/library/jslider/css/jslider.round.css
new file mode 100644
index 000000000..00ad952e6
--- /dev/null
+++ b/library/jslider/css/jslider.round.css
@@ -0,0 +1,5 @@
+
+  .jslider_round .jslider-bg i,
+  .jslider_round .jslider-pointer { background-image: url(../img/jslider.round.png); }
+
+  .jslider_round .jslider-pointer { width: 17px; height: 17px; top: -6px; margin-left: -8px; }
diff --git a/library/jslider/css/jslider.round.plastic.css b/library/jslider/css/jslider.round.plastic.css
new file mode 100644
index 000000000..4272e1fb0
--- /dev/null
+++ b/library/jslider/css/jslider.round.plastic.css
@@ -0,0 +1,5 @@
+
+  .jslider_round_plastic .jslider-bg i,
+  .jslider_round_plastic .jslider-pointer { background-image: url(../img/jslider.round.plastic.png); }
+
+  .jslider_round_plastic .jslider-pointer { width: 18px; height: 18px; top: -7px; margin-left: -8px; }