Skip to content

Commit

Permalink
close #76 now the skins can easily share img/css/js from now we shoul…
Browse files Browse the repository at this point in the history
…dn't have to duplicate image/css and javascript anymore among skins
  • Loading branch information
allan-simon committed Jul 14, 2013
1 parent 8270529 commit 272cb0d
Show file tree
Hide file tree
Showing 63 changed files with 2,445 additions and 1,284 deletions.
2 changes: 1 addition & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
project(tatowiki)

# set the version
set(PROJECT_VERSION "0.20.5")
set(PROJECT_VERSION "0.21.0")
set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
add_custom_target(
dist
Expand Down
10 changes: 3 additions & 7 deletions app/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,10 @@
"path" : "../data/sqlite6.db"
},
"baseHost" : "YOURHOST",
"innerCssFolder" : "../resources/skins/responsive/css/",
"innerImgFolder" : "../resources/skins/responsive/img/",
"innerJsFolder" : "../resources/skins/responsive/js/",
"assetsFolder" : "../resources/",
"assetsURL" : "/",
"uploadFolder" : "../upload/",
"imgPath" : "/img/",
"cssPath" : "/css/",
"jsPath" : "/js/"
"uploadUrl" : "/upload/",
"uploadURL" : "/media/get/",
},
"views" : {
"default_skin" : "responsive"
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ button.ui-button::-moz-focus-inner {
height: 100%;
}
.ui-progressbar .ui-progressbar-overlay {
background: url("/img/external/jquery-ui/animated-overlay.gif");
background: url("/img/commons/img/external/jquery-ui/animated-overlay.gif");
height: 100%;
filter: alpha(opacity=25);
opacity: 0.25;
Expand Down Expand Up @@ -812,15 +812,15 @@ body .ui-tooltip {
}
.ui-widget-content {
border: 1px solid #aaaaaa/*{borderColorContent}*/;
background: #ffffff/*{bgColorContent}*/ url(/img/external/jquery-ui/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;
background: #ffffff/*{bgColorContent}*/ url(/img/commons/img/external/jquery-ui/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;
color: #222222/*{fcContent}*/;
}
.ui-widget-content a {
color: #222222/*{fcContent}*/;
}
.ui-widget-header {
border: 1px solid #aaaaaa/*{borderColorHeader}*/;
background: #cccccc/*{bgColorHeader}*/ url(/img/external/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
background: #cccccc/*{bgColorHeader}*/ url(/img/commons/img/external/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
color: #222222/*{fcHeader}*/;
font-weight: bold;
}
Expand All @@ -834,7 +834,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid #d3d3d3/*{borderColorDefault}*/;
background: #e6e6e6/*{bgColorDefault}*/ url(/img/external/jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;
background: #e6e6e6/*{bgColorDefault}*/ url(/img/commons/img/external/jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;
font-weight: normal/*{fwDefault}*/;
color: #555555/*{fcDefault}*/;
}
Expand All @@ -851,7 +851,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
border: 1px solid #999999/*{borderColorHover}*/;
background: #dadada/*{bgColorHover}*/ url(/img/external/jquery-ui/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;
background: #dadada/*{bgColorHover}*/ url(/img/commons/img/external/jquery-ui/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;
font-weight: normal/*{fwDefault}*/;
color: #212121/*{fcHover}*/;
}
Expand All @@ -866,7 +866,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #aaaaaa/*{borderColorActive}*/;
background: #ffffff/*{bgColorActive}*/ url(/img/external/jquery-ui/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;
background: #ffffff/*{bgColorActive}*/ url(/img/commons/img/external/jquery-ui/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;
font-weight: normal/*{fwDefault}*/;
color: #212121/*{fcActive}*/;
}
Expand All @@ -883,7 +883,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #fcefa1/*{borderColorHighlight}*/;
background: #fbf9ee/*{bgColorHighlight}*/ url(/img/external/jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;
background: #fbf9ee/*{bgColorHighlight}*/ url(/img/commons/img/external/jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;
color: #363636/*{fcHighlight}*/;
}
.ui-state-highlight a,
Expand All @@ -895,7 +895,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #cd0a0a/*{borderColorError}*/;
background: #fef1ec/*{bgColorError}*/ url(/img/external/jquery-ui/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;
background: #fef1ec/*{bgColorError}*/ url(/img/commons/img/external/jquery-ui/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;
color: #cd0a0a/*{fcError}*/;
}
.ui-state-error a,
Expand Down Expand Up @@ -941,27 +941,27 @@ body .ui-tooltip {
}
.ui-icon,
.ui-widget-content .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_222222_256x240.png)/*{iconsContent}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_222222_256x240.png)/*{iconsContent}*/;
}
.ui-widget-header .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_222222_256x240.png)/*{iconsHeader}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_222222_256x240.png)/*{iconsHeader}*/;
}
.ui-state-default .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_888888_256x240.png)/*{iconsDefault}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_888888_256x240.png)/*{iconsDefault}*/;
}
.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_454545_256x240.png)/*{iconsHover}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_454545_256x240.png)/*{iconsHover}*/;
}
.ui-state-active .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_454545_256x240.png)/*{iconsActive}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_454545_256x240.png)/*{iconsActive}*/;
}
.ui-state-highlight .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/;
}
.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon {
background-image: url(/img/external/jquery-ui/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/;
background-image: url(/img/commons/img/external/jquery-ui/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/;
}

/* positioning */
Expand Down Expand Up @@ -1174,14 +1174,14 @@ body .ui-tooltip {

/* Overlays */
.ui-widget-overlay {
background: #aaaaaa/*{bgColorOverlay}*/ url(/img/external/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;
background: #aaaaaa/*{bgColorOverlay}*/ url(/img/commons/img/external/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;
opacity: .3/*{opacityOverlay}*/;
filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/;
}
.ui-widget-shadow {
margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/;
padding: 8px/*{thicknessShadow}*/;
background: #aaaaaa/*{bgColorShadow}*/ url(/img/external/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
background: #aaaaaa/*{bgColorShadow}*/ url(/img/commons/img/external/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
opacity: .3/*{opacityShadow}*/;
filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/;
border-radius: 8px/*{cornerRadiusShadow}*/;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

.markedit-toolbar button { height: 22px; outline: 0; cursor: pointer; }
.markedit-toolbar button.icon { width: 22px; background-repeat: no-repeat; margin: 0 5px 0 0; }
.markedit .light-bg button.icon { background-image: url(/img/external/wmd-buttons.png); }
.markedit .dark-bg button.icon { background-image: url(/img/external/wmd-buttons-dark.png); }
.markedit .light-bg button.icon { background-image: url(/img/commons/img/external/wmd-buttons.png); }
.markedit .dark-bg button.icon { background-image: url(/img/commons/img/external/wmd-buttons-dark.png); }

.markedit-toolbar button.bold { background-position: 0px 0px; }
.markedit-toolbar button.italic { background-position: -20px 0px; }
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions app/resources/commons/js/check_translation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
(function() {
"use strict";
// check if the slug is correct (i.e not a complete URL see #70)
function check_slug() {
var slugInput = document.getElementById("translationSlug");
var slug = slugInput.value;
if (slug.indexOf("http://") === -1 ) {
if (slug.indexOf("articles/show/") === -1) {
return true;
}
}
//TODO replace this alert by something sexier
alert("The 3rd field must contain only the last part of the URL, for example only 'linux' not 'http://example.com/articles/show/linux'");
return false;
}

// check that we're not doing a translation to the same language
function check_translation_lang() {

}
//check if the translation form is likely to validate
function check_translation_form() {
return check_slug();
}
var form = document.getElementById("translateform");
form.onsubmit = check_translation_form;


}());
File renamed without changes.
Loading

0 comments on commit 272cb0d

Please sign in to comment.