Skip to content
This repository has been archived by the owner on Sep 15, 2023. It is now read-only.

Commit

Permalink
[Weapons Viewer] Updated weapons viewer to be more visual pleasing, a…
Browse files Browse the repository at this point in the history 
…dded several expansion dividers
  • Loading branch information
@Akkadius
Akkadius committed Feb 23, 2015
1 parent ad23237 commit 36343d7
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 26 deletions.
24 changes: 24 additions & 0 deletions cust_assets/css/global.css
View file
Expand Up @@ -51,6 +51,30 @@ body { background-color: #FFFFFF !important; }
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;

-webkit-transition: 1s;
-moz-transition: 1s;
transition: 1s;
}

.morphing-glowing .image-wrap {
-webkit-transition: 1s;
-moz-transition: 1s;
transition: 1s;

-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
}

.morphing-glowing .image-wrap:hover {
-webkit-box-shadow: 0 0 20px rgba(255,255,255,.6), inset 0 0 20px rgba(255,255,255,1);
-moz-box-shadow: 0 0 20px rgba(255,255,255,.6), inset 0 0 20px rgba(255,255,255,1);
box-shadow: 0 0 20px rgba(255,255,255,.6), inset 0 0 20px rgba(255,255,255,1);

-webkit-border-radius: 60em;
-moz-border-radius: 60em;
border-radius: 60em;
}

.image-wrap {
Expand Down
48 changes: 36 additions & 12 deletions modules/ItemEditor/min.php
View file
Expand Up @@ -233,11 +233,12 @@ function GetRandomInt (min, max) {
position: relative;
width: 100%; /* for IE 6 */
}
h2 {
.image_label {
position: absolute;
bottom: -90px;
bottom: 0px;
left: 0px;
width: 100%;
width: 100%;
font-size:14px !important;
}
</style>';
if(count($_GET) == 1){
Expand All @@ -257,22 +258,45 @@ function GetRandomInt (min, max) {
$QueryResult = GetQueryResult('SELECT items.id, replace(items.idfile, "IT", "") AS WeaponList, items.icon FROM items WHERE itemtype = '. $_GET['WeaponType'] . ' GROUP BY `idfile` ORDER BY `WeaponList` ASC;');
while($row = mysql_fetch_array($QueryResult)){
if(file_exists($weapons_dir . "/" . $row['WeaponList'] . ".jpg")) {
echo '<div class="image" style="display:inline">' . "<a href='javascript:;' class='btn btn-default' onClick='FinishIDFile(" . $row['WeaponList'] . ")'><img src='" . $weapons_url . $row['WeaponList'] . ".jpg' title='IT". $row['WeaponList'] . "' width='120' height='180'/></a> "
. '<h2>IT' . $row['WeaponList'] . '</h2></div>';
echo '<div class="image" style="display:inline">' .
"<a href='javascript:;' class='btn btn-default' onClick='FinishIDFile(" . $row['WeaponList'] . ")'>
<span class='image-wrap'>
<img src='" . $weapons_url . $row['WeaponList'] . ".jpg' title='IT". $row['WeaponList'] . "' width='120' height='180' class='cut-out'/>
<span class='image_label badge badge-danger'>IT" . $row['WeaponList'] . "</span>
</span>
</a>
</div>";
}
}
}
else{
for($i = 1; $i < 100000; $i++){
if($i == 1){ echo '<h1> EQ Classic </h1>'; }
if($i == 104){ echo '<h1> Kunark </h1>'; }
if($i == 161){ echo '<h1> Velious </h1>'; }
if($i == 10000){ echo '<h1> Luclin </h1>'; }
if($i == 10200){ echo '<h1> Planes of Power </h1>'; }
if($i == 1){ echo '<h1> EQ Classic </h1><hr>'; }
if($i == 104){ echo '<h1> Kunark </h1><hr>'; }
if($i == 161){ echo '<h1> Velious </h1><hr>'; }
if($i == 10000){ echo '<h1> Luclin </h1><hr>'; }
if($i == 10200){ echo '<h1> Planes of Power </h1><hr>'; }
if($i == 10735){ echo '<h1> Omens of War </h1><hr>'; }
if($i == 10782){ echo '<h1> Dragons of Norrath </h1><hr>'; }
if($i == 10810){ echo '<h1> Depths of Darkhallow </h1><hr>'; }
if($i == 10843){ echo '<h1> Prophecy of Ro </h1><hr>'; }
if($i == 10866){ echo '<h1> The Serpents Spine </h1><hr>'; }
if($i == 11085){ echo '<h1> The Buried Sea </h1><hr>'; }
if($i == 11128){ echo '<h1> Secrets of Faydwer </h1><hr>'; }
if($i == 11257){ echo '<h1> Seeds of Destruction </h1><hr>'; }
if($i == 11274){ echo '<h1> LoN </h1><hr>'; }
if($i == 11311){ echo '<h1> Underfoot </h1><hr>'; }
if($i == 11680){ echo '<h1> House of Thule </h1><hr>'; }
if($i == 12100){ echo '<h1> VoA </h1><hr>'; }
if(file_exists("cust_assets/weapons/" . $i . ".jpg")) {
echo '<div class="image" style="display:inline">' .
"<a href='javascript:;' class='btn btn-default' onClick='FinishIDFile(" . $i . ")'><img class='lazy' data-original='cust_assets/weapons/" . $i . ".jpg' title='IT". $i . "' width='120' height='180'/></a> "
. '<h2 class="btn btn-default">IT' . $i . '</h2></div>'
"<a href='javascript:;' onClick='FinishIDFile(" . $i . ")'>
<span class='image-wrap'>
<img class='lazy cut-out' data-original='cust_assets/weapons/" . $i . ".jpg' title='IT". $i . "' width='120' height='180'/>
<span class='image_label badge badge-danger'>IT" . $i . "</span>
</span>
</a> "
. '</div>'
;
}
}
Expand Down
5 changes: 3 additions & 2 deletions modules/NPC/ajax/ajax.php
View file
Expand Up @@ -334,7 +334,7 @@
$npc_fields["Visual Texture"][$field_name][1] =
'<a href="javascript:;" onclick="OpenWindow(\'min.php?Mod=IE&prevITfile=1&Field=' . $field_name . '&NPC=' . $row['id'] . '\', \'_blank\', 900, 900)">
<span class="image-wrap " style="width: auto; height: auto;">
<img src="includes/img.php?type=weaponimage&id='. $val . '" id="'. $field_name . '" class="embossed">
<img src="includes/img.php?type=weaponimage&id='. $val . '" id="'. $field_name . '" class="embossed morphing-glowing">
</span>
</a>
';
Expand Down Expand Up @@ -362,6 +362,7 @@
$td_content = "";
$n = 0;

/* Manually push this field into the Appearance Category */
$npc_fields["Appearance"]["tint"][0] = "Armor Tint";
$npc_fields["Appearance"]["tint"][1] = "<div id='armor_tint_selector'></div>";

Expand All @@ -376,7 +377,7 @@
#print $key . '<br>';
if($key == "d_melee_texture1" || $key == "d_melee_texture2" || $key == "race"){
$td_content .= '
<td style="text-align:center;vertical-align:top">' . $val[0] . '<br> ' . $val[1] . ' </td>';
<td style="text-align:center;vertical-align:top">' . $val[1] . '<br><b>' . $val[0] . '</b></td>';
}
else {
$td_content .= '
Expand Down
23 changes: 11 additions & 12 deletions modules/NPC/ajax/single_npc_edit.js
View file
Expand Up @@ -2,18 +2,6 @@
* Created by Akkadius on 2/22/2015.
*/

$(".modal-body input, .modal-body select").each(function () {
$(this).addClass("form-control");
});

$("select").each(function () {
$(this).tooltip();
});

$(":text").each(function () {
$(this).tooltip();
});

$(document).ready(function () {
$("#armor_tint_selector").html("<div id=\"picker\" style=\"display:inline\"></div>");
$("#picker").colpick({
Expand Down Expand Up @@ -50,4 +38,15 @@ $(document).ready(function () {
$(".page-content img").each(function() {
$(this).css("border", "2px solid #666");
});
$(".modal-body input, .modal-body select").each(function () {
$(this).addClass("form-control");
});

$("select").each(function () {
$(this).tooltip();
});

$(":text").each(function () {
$(this).tooltip();
});
});

0 comments on commit 36343d7

Please sign in to comment.