Commit b080f21e authored by yPhil's avatar yPhil
Browse files

SYNC: Menu integration OK

parent 1798efe8
......@@ -152,10 +152,6 @@ li.mobTab {
background-color: var(--bg-color-sec) !important;
}
h1, h2, p.ui {
color: var(--ui-color-pri) !important;
}
p.dialog > a:link {
color: var(--color-pri) !important;
}
......@@ -942,70 +938,74 @@ li.feedItem:hover {
/* Rs Widget */
.rs-widget {
background-color: var(--ui-color-qua) !important;
color: var(--ui-color-pri) !important;
box-shadow: none !important;
}
/* .rs-widget { */
/* background-color: var(--ui-color-qua) !important; */
/* color: var(--ui-color-pri) !important; */
/* box-shadow: none !important; */
/* } */
#remotestorage-widget {
background-color: var(--ui-color-qua) !important;
/* #remotestorage-widget { */
/* background-color: var(--ui-color-qua) !important; */
position: absolute;
top: 0;
right: 0;
/* position: absolute; */
/* top: 0; */
/* right: 0; */
/* /\* float:right; *\/ */
/* } */
/* float:right; */
#remotestorage-widget {
color: var(--ui-bg-color-pri) !important;
}
#remotestorage-widget > .rs-widget {
margin: 0;
padding: 0;
border-radius: 0 0 0 3px;
margin: 0 0 .4em 0;
padding-left: 0;
border-radius: 3px;
}
/* .rs-main-logo { */
/* margin: 3px 0 0 15px !important; */
/* } */
.rs-button-small {
background-color: #ededed !important;
border-color: #ededed !important;
margin: 2px 0 0 0 !important;
}
/* .rs-button-small { */
/* background-color: #ededed !important; */
/* border-color: #ededed !important; */
/* margin: 2px 0 0 0 !important; */
/* } */
/* .rs-button-small:first-child { */
/* margin: 2px 0 0 6px !important; */
/* } */
.rs-box-connected {
margin: 0 6px 0 0 !important;
}
/* .rs-box-connected { */
/* margin: 0 6px 0 0 !important; */
/* } */
.rs-disconnect:hover {
border-color: var(--ui-color-sec);
}
/* .rs-disconnect:hover { */
/* border-color: var(--ui-color-sec); */
/* } */
.rs-disconnect:hover .rs-icon{
fill: var(--ui-color-sec);
}
/* .rs-disconnect:hover .rs-icon{ */
/* fill: var(--ui-color-sec); */
/* } */
.rs-sync:hover {
border-color: #FFBB0C;
}
/* .rs-sync:hover { */
/* border-color: #FFBB0C; */
/* } */
.rs-sync:hover .rs-icon {
fill: #FFBB0C;
}
/* .rs-sync:hover .rs-icon { */
/* fill: #FFBB0C; */
/* } */
.rs-sync.rs-rotate {
border-color: #FFBB0C;
}
/* .rs-sync.rs-rotate { */
/* border-color: #FFBB0C; */
/* } */
.rs-sync.rs-rotate .rs-icon {
fill: #FFBB0C;
animation: rs-spin 1s linear infinite;
}
/* .rs-sync.rs-rotate .rs-icon { */
/* fill: #FFBB0C; */
/* animation: rs-spin 1s linear infinite; */
/* } */
/* MenuBar */
/* Add a black background color to the top navigation */
......
......@@ -43,7 +43,6 @@ MOB.i18n.translations = {
"element" : { fr : "élément", ja: "データ?要素" },
"End": { fr: "Fin", ja: "最後" },
"Every" : { fr: "Toutes les", ja: "毎日" },
"Export": { fr: "Export", ja: "輸出" },
"Go": { fr: "Aller", ja: "行く" },
"In progress": { fr: "En cours", ja: "進行中" },
"Manage": { fr: "Gérer", ja: "管理する" },
......@@ -77,9 +76,8 @@ MOB.i18n.translations = {
"source" : { fr: "source" , ja: "ソース", es: "fuente" },
"Source" : { fr: "Source" , ja: "RSSフィード", es: "Source" },
"Sources" : { fr: "source" , ja: "RSSフィード" },
"Group" : { fr: "groupe" , ja: "タブ", es: "Grupo" },
"Source" : { fr: "Source" , ja: "ソース", es: "Fuente" },
"Sources" : { fr: "Sources" , ja: "ソース", es: "Fuentes" },
"Groups" : { fr: "Groupes" , ja: "タブ", es: "Grupos" },
"Theme" : { fr: "Thème" , ja: "テーマ", es: "Tema" },
"Language" : { fr: "Langue" , ja: "言語", es: "Idioma" },
......@@ -106,6 +104,10 @@ MOB.i18n.translations = {
"Donate" : { fr: "Donation" , ja: "寄付する", es: "Donar" },
"Open" : { fr: "Ouvrir" , ja: "負荷", es: "Carga" },
"Save" : { fr: "Sauver" , ja: "セーブ", es: "Salvar" },
"Import" : { fr: "Import" , ja: "インポート", es: "Importar" },
"Export" : { fr: "Export" , ja: "輸出する", es: "Exportar" },
"Rename Group" : { fr: "Groupe: Renommer" , ja: "名前の変更タブ", es: "Cambiar el nombre de la grupo" },
"Add source" : { fr: "Ajouter source" , ja: "ソースを追加", es: "Agregue fuente" },
"Add sources" : { fr: "Ajouter sources" , ja: "ソースを追加", es: "Agregue fuentes" },
......@@ -174,7 +176,7 @@ MOB.i18n.translations = {
"Huh, Next question" : { fr: "Euh, Question suivante" , ja: "あ、次の質問", es: "Eh, Siguiente pregunta" },
"Open / import groups and sources" : { fr: "Ouvrir / importer groupes et sources" , ja: "タブを開く/インポートする", es: "Abrir / importar grupos y canales RSS" },
"Save / Export groups and sources" : { fr: "Enregistrer / exporter groupes et sources" , ja: "タブとフィードの保存/エクスポート", es: "Guardar archivo de groups y sources" },
"Save / export groups and sources" : { fr: "Enregistrer / exporter groupes et sources" , ja: "タブとフィードの保存/エクスポート", es: "Guardar archivo de groups y sources" },
"Open group on source drop" : { fr: "Ouvrir nouveau groupe" , ja: "ドロップ時にタブを開く", es: "Abrir grupo en drop" },
"If this is set, when you drag & drop one or more source(s) in a group, said group opens" : { fr: "Ouvrir le groupe où une source est déposée" , ja: "魔法使いのタブを開いて餌を入れる", es: "Abrir grupo en donde se pone un canal" },
......
......@@ -10,8 +10,11 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
$donate = $('button#donate').button(),
$addSource = $('button#addSource').button(),
$slider = $('div#gallerySpeedSlider'),
$syncBox = $('div#syncBox'),
$spinner = $('#gallerySpeedSpinner');
MOB.sync.rs();
MOB.utilities.translate();
$langMenu.val(MOB.prefs.readConfig('lang')).prop('selected', true);
......
......@@ -52,7 +52,7 @@ MOB.sync = (function() {
remoteStorage.access.claim('petrolette', 'rw');
return widget.attach();
return widget.attach('syncBox');
},
readSync:function() {
......
......@@ -32,7 +32,7 @@
<fieldset class="ui-widget ui-widget-content ui-corner-all">
<legend id="tabsLegend"
class="ui-corner-top translate"
data-content="Groups">Groups</legend>
data-content="Sources">Sources</legend>
<div class="flexBox">
<input id="fileImport"
......@@ -41,31 +41,35 @@
<button id="fileImport"
class="grow translate"
data-title="Open / import groups and sources"
data-content="Open">
data-content="Import">
<i class="icon-upload"></i>
Load
Import
</button>
<button id="saveTabs"
class="grow translate last"
data-title="Save / Export groups and sources"
data-content="Save">
data-title="Save / export groups and sources"
data-content="Export">
<i class="icon-download"></i>
Save
Export
</button>
</div>
<div class="flexBox">
<input class="checkboxradio ui-helper-hidden" type="checkbox" name="tabDropActivate" id="tabDropActivate">
<label id="dropTabLabel"
class="translate last"
for="tabDropActivate"
data-title="If this is set, when you drag & drop one or more source(s) in a group, said group opens"
title="If this is set, when you drag & drop one or more source(s) in a group, said group opens"
data-content="Open group on source drop">
Open group on source drop
</label>
</div>
<div id="syncBox"></div>
<!-- <div class="flexBox">
<input class="checkboxradio ui-helper-hidden" type="checkbox" name="tabDropActivate" id="tabDropActivate">
<label id="dropTabLabel"
class="translate last"
for="tabDropActivate"
data-title="If this is set, when you drag & drop one or more source(s) in a group, said group opens"
title="If this is set, when you drag & drop one or more source(s) in a group, said group opens"
data-content="Open group on source drop">
Open group on source drop
</label>
</div>
-->
</fieldset>
<fieldset class="menuForm ui-widget ui-widget-content ui-corner-all">
......
......@@ -92,15 +92,15 @@
<script src="/static/lib/js/tab.js"></script>
<script src="/static/lib/js/feed.js"></script>
<script src="/static/lib/js/dialog.js"></script>
<script src="/static/lib/js/menu.js"></script>
<script src="/static/lib/js/sync.js"></script>
<script src="/static/lib/js/menu.js"></script>
<script>
$(document).ready(function() {
$.getScript('/static/lib/js/init.js');
MOB.sync.rs();
// MOB.sync.rs();
var $widget = $('#remotestorage-widget');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment