Merge branch 'master' of mojotrollz.eu:hosting

This commit is contained in:
Nael 2013-11-10 00:13:27 +01:00
commit 9498a73007
11 changed files with 66 additions and 40 deletions

View File

@ -11,11 +11,8 @@ Web
* Serverstats
* Friendlist
* Import
* item-slot functionality (Bank, Storage, Kleiderschrank)
* Reskill Funtkion / Skill Funktion
* Gildenfacebook
* inter-platform-chat
* Achievements
Backend
-------
@ -31,3 +28,24 @@ Game
* Firstkilltruhen
* Instanz-Spieler-Skalierung
* Questlog extend?
Phase 1
-------
* Charerstellung
* Gebiete raus
* Loot raus
* Quests raus
* Objects deavtivate (chests)
* Guild
* Chat
* Instanzen schließen
* Character Page
* Character Transfere
* Custom Set zum Craften T0.75
* Quest Gebiete um die Städte
PHASE 2
-------
* item-slot functionality (Bank, Storage, Kleiderschrank)
* Reskill Funtkion / Skill Funktion
* Achievements

View File

@ -1,23 +1,23 @@
.parent{
width: 1000px;
position: absolute;
display: table;
width: 1000px;
}
.left{
width: 26px;
display: table-cell;
vertical-align: middle;
width: 30%;
position: relative;
}
.right{
width: 26px;
display: table-cell;
width: 20px;
position: relative;
}
.bottom{
display: table-row;
width: 100%;
position: relative;
height: 20px;
height: 25px;
}

View File

@ -26,35 +26,32 @@
<img src="${PICPATH}border_top.png" width="100%"/>
</div>
<div class="parent" style="background: url(${PICPATH}background.png);" >
<div style="display: table-row">
<div id="frame_left" class="left" style="background: url(${PICPATH}border_left.png) repeat-y; width: 25px;">
</div>
<div id="content_wrapper" style="padding-left: 10px; padding-right: 10px;">
<div id="content" >
<div>
welcome
</div>
<div style="float: right; padding-right: 10px;">
<h3>Login</h3>
<input type="text" class="form-control input-lg" id="username" placeholder="${user_name}"></br>
<input type="password" class="form-control input-lg" id="password" placeholder="${password}"></br>
<input type="submit" class="form-control input-lg" id="login" value="Login">
<div style="display: table-row">
<div id="frame_left" class="left" style="background: url(${PICPATH}border_left.png) repeat-y;"></div>
<div id="content_wrapper" style="padding-left: 10px; padding-right: 10px; padding-bottom: 75px;">
<div id="content" >
<div>
welcome
</div>
<div style="float: right; padding-right: 10px;">
<h3>Login</h3>
<input type="text" class="form-control input-lg" id="username" placeholder="${user_name}"></br>
<input type="password" class="form-control input-lg" id="password" placeholder="${password}"></br>
<input type="submit" class="form-control input-lg" id="login" value="Login">
</div>
</div>
<div style="clear: both;"></div>
<div id="back" style="float: left; display: none;"><a href="#"><img src="${PICPATH}arrow_left.png"/></a></div>
<div id="next" style="float: right;"><a href="#"><img src="${PICPATH}arrow_right.png"/></a></div>
<div id="register" style="float: right; display: none;"><a href="#">REG NOW BUTTON</a></div>
</div>
<div class="right" style="background: url(${PICPATH}border_right.png) repeat-y;"></div>
</div>
<div style="clear: both;"></div>
<div id="back" style="float: left; display: none;"><a href="#"><img src="${PICPATH}arrow_left.png"/></a></div>
<div id="next" style="float: right;"><a href="#"><img src="${PICPATH}arrow_right.png"/></a></div>
<div id="register" style="float: right; display: none;"><a href="#">REG NOW BUTTON</a></div>
<div class="bottom">
<div class="" style="display: table-cell; background: url(${PICPATH}border_bot_l.png) no-repeat;">&nbsp;</div>
<div class="" style="display: table-cell; background: url(${PICPATH}border_bot_m.png) repeat-x;">&nbsp;</div>
<div class="" style="display: table-cell; background: url(${PICPATH}border_bot_r.png) no-repeat;">&nbsp;</div>
</div>
<div class="right" style="background: url(${PICPATH}border_right.png) repeat-y;"></div>
</div>
<div class="bottom">
<div class="" style="display: table-cell; background: url(${PICPATH}border_bot.png) no-repeat;">&nbsp;</div>
<div class="" style="display: table-cell; background: url(${PICPATH}border_bot.png) no-repeat;">&nbsp;</div>
<div class="" style="display: table-cell; background: url(${PICPATH}border_bot.png) no-repeat;">&nbsp;</div>
</div>
</div>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -36,7 +36,7 @@ function load_wizard_page (state){
wizard_state = state;
$('#content').hide();
$('#content').load('?action='+state);
$('#content').fadeIn(500);
$('#content').show(750);
for(var i=0; i<WizardStates.length;i++){
if(WizardStates[i][0] == state){

View File

@ -1,3 +1,14 @@
<div id="map_kalimdor">
<img src="${PICPATH}kalimdor_map.png"/>
<div id="map_info" style="float: left;">
abc info
</div>
<div id="map_friends" style="float: left;">
abc friends
</div>
<div style="float: right;">
<div id="map_eastern_kingdoms">
<img src="${PICPATH}eastern_kingdoms_map.png"/>
</div>
<div id="map_kalimdor" style="display: none;">
<img src="${PICPATH}kalimdor_map.png"/>
</div>
</div>