diff --git a/familyark/app/public/css/main.css b/familyark/app/public/css/main.css index 7a0ed7c..87108ec 100644 --- a/familyark/app/public/css/main.css +++ b/familyark/app/public/css/main.css @@ -1,3 +1,8 @@ +@font-face { + font-family: ark; + src: url(/font/ARK-Regular.ttf); +} + body{ background-image: url(/images/bg.jpg); height: 100%; @@ -8,7 +13,7 @@ body{ overflow-y:scroll; color: white; text-shadow: 0px 0px 3px rgb(0, 153, 153); - font-family: 'Palanquin Dark', sans-serif; + font-family: ark; } #menu{ @@ -24,13 +29,17 @@ body{ #menu h4 a, h1{ - color: rgb(0, 153, 153); - text-shadow: 0px 0px 3px rgb(0, 0, 0); - text-decoration: underline; + font-family: ark; + font-weight: bold; + text-shadow: 0px 0px 2px rgb(0, 0, 0); +} + +h2{ + font-family: ark; } #menu h4 a:hover{ cursor: pointer; - color: white; + color: rgb(0, 153, 153); } #menu li a{ @@ -111,4 +120,22 @@ table.info{ #a-mother button, .Female{ background-color: pink; +} + +#load{ + position: fixed; + width: 100vw; + height: 100vh; + display: flex; + justify-content: center; + align-items: center; + background-color: rgba(0, 153, 153); +} + +#load img{ + border-radius: 50%; + border: 1px solid black; + -webkit-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75); + -moz-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75); + box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75); } \ No newline at end of file diff --git a/familyark/app/public/font/ARK-Regular.ttf b/familyark/app/public/font/ARK-Regular.ttf new file mode 100644 index 0000000..99b64ef Binary files /dev/null and b/familyark/app/public/font/ARK-Regular.ttf differ diff --git a/familyark/app/public/images/load.gif b/familyark/app/public/images/load.gif new file mode 100644 index 0000000..2efe9ac Binary files /dev/null and b/familyark/app/public/images/load.gif differ diff --git a/familyark/app/public/index.html b/familyark/app/public/index.html index f7049db..1ea8a1d 100644 --- a/familyark/app/public/index.html +++ b/familyark/app/public/index.html @@ -25,5 +25,8 @@
+
+ +
diff --git a/familyark/app/public/js/buttons.js b/familyark/app/public/js/buttons.js index 56d9fe4..37f23e0 100644 --- a/familyark/app/public/js/buttons.js +++ b/familyark/app/public/js/buttons.js @@ -1,8 +1,7 @@ $('document').ready(function(){ - $( "#body" ).load( "/templates/home.html" ); - // Botones $("#home").click(function(){ + $("#load").fadeIn(0); $( "#body" ).load( "/templates/home.html" ); $.get("/info", function( data ) { var text = "" @@ -11,10 +10,12 @@ $('document').ready(function(){ }); text += "
" $( "#info" ).html( text ); + $("#load").fadeOut("fast"); }); }); $("#animals").click(function(){ + $("#load").fadeIn(0); $.get( "/animal", function( data ) { $.get( "/species", function( species_r ) { var species = {}; @@ -22,7 +23,7 @@ $('document').ready(function(){ species[item._id] = item.name }); - $( "#body" ).html("

Yours Dinos



"); + $( "#body" ).html("

Yours Dinos

"); $( "#animal-add").click(function(){ $( "#body" ).load( "/templates/animal-form.html", function (){ set_animal_include(""); @@ -50,10 +51,12 @@ $('document').ready(function(){ return '    '; }} ]}); + $("#load").fadeOut("fast"); }); }); }); $("#species").click(function(){ + $("#load").fadeIn(0); $.get( "/species", function( data ) { $( "#body" ).html("

All Species

"); dataSet = data.data.map(function(item) { @@ -64,17 +67,16 @@ $('document').ready(function(){ responsive: true, columns: [ { title: "Name" }, - { title: "Description" }, - { title: "Options", className: "options-table-species", orderable: false,data: null, targets: -1, "mRender": function(data, type, full) { - return '' - }} + { title: "Description" } ] }); + $("#load").fadeOut("fast"); }); }); $("#about").click(function(){ - $( "#body" ).load( "/templates/about.html" ); + $("#load").fadeIn(0); + $( "#body" ).load( "/templates/about.html", function(){$("#load").fadeOut("fast");} ); }); }); diff --git a/familyark/app/public/js/functions.js b/familyark/app/public/js/functions.js index 036e60e..480eefa 100644 --- a/familyark/app/public/js/functions.js +++ b/familyark/app/public/js/functions.js @@ -29,6 +29,7 @@ function onSubmitAnimal(form){ }; function editAnimal(id){ + $("#load").fadeIn(0); $( "#body" ).load( "/templates/animal-form.html", function(){ var animal; $.get( "/animal/"+id, function( data ) { @@ -48,19 +49,21 @@ function editAnimal(id){ } set_animal_include(animal._id); paint_male_female(animal.specie, animal._id); + $("#load").fadeOut("slow"); }); }); } function showAnimal(id){ - $( "#body" ).load( "/templates/animal-show.html", function(){ + $("#load").fadeIn(0); + $( "#body" ).load( "/templates/animal-show.html", function(){ var text = ""; $.get( "/animal/"+ id, function( data ) { var animal = data.data, j = 1; $.each(animal, function(i, val) { - if(i != "_id" && i != "__v" && i.indexOf("initial") < 0) + if(i != "_id" && i != "__v" && i != "father" && i != "mother" && i != "name" && i.indexOf("initial") < 0) text += ""; // if(j % 3 == 0) text += "" j++; @@ -73,6 +76,7 @@ function showAnimal(id){ get_parrents(animal); get_childrens(animal); + $("#load").fadeOut("slow"); }); }); diff --git a/familyark/app/public/js/main.js b/familyark/app/public/js/main.js index aeb4f09..f3bdf13 100644 --- a/familyark/app/public/js/main.js +++ b/familyark/app/public/js/main.js @@ -1,10 +1,13 @@ $('document').ready(function(){ - $.get("/info", function( data ) { - var text = "
"+i+""+(val ? val.$numberDecimal ? val.$numberDecimal : val : "")+"
" - $.each(data, function(i, obj) { - text += ""; + $( "#body" ).load( "/templates/home.html", function(){$("#load").fadeOut("slow"); + $.get("/info", function( data ) { + var text = "
"+i+" "+obj+"
" + $.each(data, function(i, obj) { + text += ""; + }); + text += "
"+i+" "+obj+"
" + $( "#info" ).html( text ); + $("#load").fadeOut("slow"); }); - text += "" - $( "#info" ).html( text ); }); }) \ No newline at end of file diff --git a/familyark/app/public/templates/about.html b/familyark/app/public/templates/about.html index f85dc82..2d2ef7f 100644 --- a/familyark/app/public/templates/about.html +++ b/familyark/app/public/templates/about.html @@ -1,17 +1,9 @@

About

-

-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum mollis venenatis vulputate. Interdum et malesuada fames ac ante ipsum primis in faucibus. Duis magna leo, porta vel egestas vitae, aliquam at nunc. Ut non lobortis orci. Donec mi mi, vestibulum dapibus mauris at, sagittis lobortis dui. Proin non diam congue, lobortis ex vel, malesuada velit. Vivamus pulvinar est ut mollis mattis. Ut eget dapibus felis. Etiam tempor blandit dictum. Morbi lobortis diam vitae quam ullamcorper porttitor. Morbi vitae justo nec nisl placerat lobortis in id lorem. In nec volutpat sem. Donec nulla urna, feugiat convallis commodo sed, suscipit non lectus. Curabitur pulvinar nulla quis nulla placerat, id eleifend urna sagittis. Phasellus efficitur nunc non turpis tincidunt aliquet. Sed a nunc arcu. -

-

-Nullam eget nunc vitae arcu scelerisque luctus. In neque ipsum, gravida sit amet nulla eu, fringilla ornare lacus. Cras justo justo, sodales at metus eget, luctus congue risus. Integer consequat dui ut augue commodo hendrerit. Vivamus sollicitudin pellentesque orci at commodo. Nullam nec felis quis purus porttitor auctor. Ut posuere sem quam, quis finibus elit semper sed. Nulla ut lectus enim. Ut dignissim ante metus, eget rutrum diam dignissim sit amet. Proin purus risus, tristique at massa et, maximus malesuada erat. Integer eget fringilla nunc. Aenean mattis volutpat vehicula. Aenean in nibh eget nulla elementum congue eget ac metus. Curabitur diam nunc, iaculis a aliquam ut, porta at lorem. Praesent convallis tincidunt nibh et vehicula. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. -

-

-Nam imperdiet ultrices mi. Sed volutpat laoreet interdum. Aenean rutrum, urna nec suscipit maximus, nibh lacus lacinia massa, maximus commodo turpis felis ut magna. Aliquam erat volutpat. Pellentesque ultricies aliquam convallis. Sed vel finibus nibh. In congue nisl nec blandit tristique. Etiam eros odio, convallis sit amet quam a, mattis convallis metus. -

-

-Suspendisse consequat laoreet leo et vehicula. Morbi id tortor id magna sagittis consectetur. Pellentesque ac arcu sit amet odio iaculis rutrum. Praesent nec pulvinar mi. Nulla facilisi. Phasellus at purus euismod, eleifend neque molestie, vehicula eros. Vestibulum lobortis neque libero, vitae bibendum felis consectetur sit amet. Nullam ullamcorper at magna vel sollicitudin. Aenean feugiat ante ac venenatis feugiat. Aliquam sodales dapibus dui. Cras neque ante, dignissim ac porta rutrum, eleifend vel elit. Fusce sollicitudin nulla non dui gravida hendrerit. Aliquam erat volutpat. Vestibulum malesuada ante erat, nec porta tellus condimentum in. Aenean tincidunt ipsum id urna laoreet congue. In sed augue eget purus tempor tempus. -

-

-Vestibulum quam magna, cursus in dui at, sodales rhoncus lorem. Aliquam egestas tellus hendrerit velit commodo, eget porttitor purus viverra. Nulla facilisi. Etiam vulputate gravida quam id condimentum. Mauris dapibus arcu vitae ornare sollicitudin. Nam eros mauris, semper eget rutrum eget, pretium in dui. Pellentesque id feugiat risus. Donec mattis diam nulla, sed finibus urna hendrerit id. Donec vitae posuere sem, quis rhoncus libero. Vivamus congue, tortor egestas aliquam tempus, tortor sapien accumsan lacus, vel iaculis nunc ligula vitae erat. Pellentesque lacus mauris, tristique id leo id, ultrices eleifend enim. Vestibulum consequat elit id dui suscipit, ac consectetur ligula viverra. In ut tellus ut turpis congue mattis vel sit amet tellus. -

+

+ FamilyArk es una aplicacion para gestion de la crianza en Ark - Survival Evolved. +

+

+ Esta mantenida por hatthieves.es sin animo de lucro. Y no se da ninguna garantia o soporte de la misma. +

+