Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Restyle Multiple Pages
Update settings, intro to diplomacy, developer, and datc tests pages to modern styling. Minor content corrections.
  • Loading branch information
jmo1121109 committed Mar 30, 2019
1 parent 5bb12d4 commit 674f553
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 128 deletions.
106 changes: 104 additions & 2 deletions css/global.css
Expand Up @@ -638,7 +638,7 @@ TABLE {
border-collapse: collapse;
width:100%;
}
div.datc table {
/* div.datc table {
border: solid #aaa 1px;
}
div.datc th, .datc td {
Expand All @@ -651,7 +651,7 @@ div.datc th {
border-bottom: solid #aaa 1px;
padding: 3px 5px;
font-size:16px;
}
} */
TABLE.credits {
border: solid #aaa 1px;
width:85%;
Expand Down Expand Up @@ -745,6 +745,47 @@ TD.army, div.army {
}
/* End of section for FAQ styling */

/* Section for datc styling */
.datc {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
border-collapse: collapse;
}

.datc td, .datc th {
border: 1px solid #ddd;
padding: 6px;
}

.datc tr:nth-child(even){background-color: #f2f2f2; word-break: break-word;}
.datc tr:nth-child(odd){background-color: #ffffff; word-break: break-word;}

.datc th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
background-color: #009902;
color: white;
min-width:70px;
}
/* End of section for Hall of Fame styling */

/* Section for Developer styling */
.developerInfo-show {
border-radius: 7px;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
overflow: hidden;
background-color: #f1f1f1;
font-size: 14px;
padding: 0 0 0 10px;
margin-top:0px !important;
}

.developerInfo-show h3 {
margin-left: 0px !important;
}
/* End of section for Developer styling */


/* Section for Hall of Fame styling */
.hof {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
Expand Down Expand Up @@ -810,6 +851,64 @@ input[type="text"].contactUs, input[type="password"].contactUs, textarea.contact
}
/* End of section for contactUsDirect page styling */

/* Section for intro page */
.introToDiplomacy {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}

.introToDiplomacy_show {
border-radius: 7px;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
overflow: hidden;
background-color: #f1f1f1;
font-size: 14px;
padding: 0 0 0 10px;
margin-top:0px !important;
}
/* End of section for intro page */

/* Section for settings page */
.settings {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}

.settings_show {
border-radius: 7px;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
overflow: hidden;
background-color: #f1f1f1;
font-size: 14px;
padding: 0 0 0 10px;
margin-top:0px !important;
}

.settings-submit {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
color: #fff !important;
text-transform: uppercase;
background: #60a3bc !important;
padding: 5px;
border-radius: 50px;
display: inline-block;
border: none;
}

.settings-submit:hover {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
text-shadow: 0px 0px 6px rgba(255, 255, 255, 1);
transition: all 0.4s ease 0s;
}

input[type="text"].settings, input[type="password"].settings, textarea.settings, select.settings {
font-size: 14px;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
background-color: #ffffff !important;
border: 1px solid #c1c1c1;
color:#000000;
}
/* End of section for settings page */


/* Section for credits page styling */
.credits {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
Expand Down Expand Up @@ -1301,4 +1400,7 @@ input[id^="FinalizeButton"]{
textarea.contactUs, input[type="text"].contactUs, select.contactUs{
width: 80%;
}
textarea.settings, input[type="text"].settings, input[type="password"].settings, select.settings{
width: 80%;
}
}
2 changes: 1 addition & 1 deletion datc.php
Expand Up @@ -26,7 +26,7 @@

libHTML::starthtml(l_t('DATC Tests'));

print libHTML::pageTitle(l_t('Diplomacy Adjudicator Test Cases'),l_t('The results of a set of automated tests which show the webDiplomacy\'s compliance with the official Diplomacy rules.'));
print libHTML::pageTitle(l_t('Diplomacy Adjudicator Test Cases'),l_t('The results of a set of automated tests which show webDiplomacy\'s compliance with the official Diplomacy rules.'));

if ( $Misc->Maintenance )
{
Expand Down
8 changes: 2 additions & 6 deletions locales/English/datc.php
Expand Up @@ -117,20 +117,16 @@
<a name="tests"></a><h4>Tests</h4>
<table>
';
$alternate=2;
$lastSectionID=-1;
while ( list($id, $name, $status, $description) = $DB->tabl_row($tabl) )
{
$alternate = 3-$alternate;

$sectionID = floor($id/100);
if( $sectionID != $lastSectionID )
{
print '<tr class="replyalternate'.$alternate.'">
print '<tr class="datc">
<th>'.$sections[$sectionID][0].'</th>
<th><a name="section'.$sectionID.'"></a>'.$sections[$sectionID][1].'</th>
</tr>';
$alternate = 3-$alternate;
}
$lastSectionID = $sectionID;

Expand All @@ -149,7 +145,7 @@
$name.'</a> - '.$status.'<br />'.$description;

print '
<tr class="threadalternate'.$alternate.'">
<tr class="datc">
<td><p class="notice">'.$image.'</p></td>
<td><p>'.$details.'</p></td>
</tr>
Expand Down
50 changes: 24 additions & 26 deletions locales/English/developers.php
Expand Up @@ -25,25 +25,26 @@
* @subpackage Static
*/

print libHTML::pageTitle('Developer/webmaster info','If you want to fix/improve/install webDiplomacy all the info you need to make it happen is here.');

print libHTML::pageTitle('Developer/webmaster info','All the info you need to help improve or install webDiplomacy.');
?>

<p>Webdiplomacy is open source, and we welcome contributions! You can find our todo list <a href="https://github.com/kestasjk/webDiplomacy/issues">here</a>, and our code <a href="https://github.com/kestasjk/webDiplomacy">here</a></p>

<div class="hr"></div>

<h4>Feature requests</h4>
<div class = "developerInfo-show">
<p>Webdiplomacy is open source, and we welcome contributions! You can find our todo list <a href="https://github.com/kestasjk/webDiplomacy/issues">here</a>,
and our code <a href="https://github.com/kestasjk/webDiplomacy">here</a></p>

<p>We get a lot of feature requests. If your feature request isn't already on our issue tracker, then the best place to ask is the forum. This will help us gauge support for your ideas, before we add it to the todo list. </p>
<h3>Feature requests</h3>

<div class="hr"></div>
<h4>Bug reports</h4>
<p>We get a lot of feature requests. If your feature request isn't already on our issue tracker, then the best place to ask is the forum.
This will help us gauge support for your ideas, before we add it to the todo list. </p>

<h3>Bug reports</h3>

<p>If you're familiar with github, you're welcome to submit a bug report in our issue tracker. Please be as detailed as possible, and include steps to reproduce the bug, what happens, and what you expect to happen instead. If you don't want to use github, you can also email bug reports to webdipmod@gmail.com.</p>
<div class="hr"></div>
<p>If you're familiar with github, you're welcome to submit a bug report in our issue tracker. Please be as detailed as possible,
and include steps to reproduce the bug, what happens, and what you expect to happen instead. If you don't want to use github,
you can also email bug reports to <a href="mailto:<?php print (isset(Config::$modEMail) ? Config::$modEMail : Config::$adminEMail); ?>">
<?php print (isset(Config::$modEMail) ? Config::$modEMail : Config::$adminEMail); ?></a>.</p>

<h4>Code contributions</h4>
<h3>Code contributions</h3>

<p>We welcome code contributions for any of the issues on the "soon" milestone. Simply fork the project, and develop a fix in a branch. We accept pull requests that:</p>

Expand All @@ -59,27 +60,24 @@

<ul>
<li>The details of the testing that you've performed</li>
<li>The github issue number that this pull request is a fix for</li>
<li>The github issue number that this pull request is a fix for if applicable</li>
</ul>

<p>Any questions, please email webdipmod@gmail.com, and a member of the dev team will answer.</p>
<p>Any questions, please email <a href="mailto:<?php print (isset(Config::$modEMail) ? Config::$modEMail : Config::$adminEMail); ?>" >
<?php print (isset(Config::$modEMail) ? Config::$modEMail : Config::$adminEMail); ?></a>, and a member of the dev team will answer.</p>


<div class="hr"></div>
<h4>Code links</h4>
<h3>Code links</h3>
<p><a href="https://github.com/kestasjk/webDiplomacy" class="light">github.com/kestasjk/webDiplomacy</a> - the code</p>
<p><a href="https://github.com/kestasjk/webDiplomacy/issues" class="light">github.com/kestasjk/webDiplomacy</a> - the issues</p>

<h4>Webmasters</h4>
<h3>Webmasters</h3>

<p><a href="http://webdiplomacy.net/README.txt" class="light">README.txt</a> - Installation data for webmasters</p>

<p><a href="http://webdiplomacy.net/AGPL.txt" class="light">AGPL.txt</a> - The license protecting this code, if you make
changes to the code you've got to share those changes.</p>

<div class="hr"></div>

<h4>Layout</h4>
<h3>Layout</h3>

<p>If you want to make a change this is where you should start. The two images and text files below will give you a feel
for where everything is and how webDip is structured, so you know where to go to find whatever you need to change.</p>
Expand All @@ -91,9 +89,7 @@
<a href="http://webdiplomacy.net/doc/layout-database.txt" class="light">layout-database.txt</a>
- The database layout image and text file; how the database is structured and what different tables do</p>

<div class="hr"></div>

<h4>Misc notes</h4>
<h3>Misc notes</h3>

<p><a href="http://webdiplomacy.net/doc/javascript.txt" class="light">javascript.txt</a> - JavaScript info</p>

Expand All @@ -104,4 +100,6 @@
<p><a href="http://webdiplomacy.net/doc/coasts.txt" class="light">coasts.txt</a> - Info on how coasts are handled</p>

<p>We used to have a forum for developers, but it was closed due to inactivity and spammers. Some of the content there is still useful:
<a href="http://forum.webdiplomacy.net" class="light">forum.webdiplomacy.net</a> </p>
<a href="http://forum.webdiplomacy.net" class="light">forum.webdiplomacy.net</a>
</p>
</div>
9 changes: 5 additions & 4 deletions locales/English/intro.php
Expand Up @@ -25,9 +25,9 @@
* @subpackage Static
*/

print libHTML::pageTitle('Intro to webDiplomacy','A quick &amp; easy guide to get newcomers to webDiplomacy playing the game.');
print libHTML::pageTitle('Intro to webDiplomacy','A quick guide to get newcomers playing the game.');

print '
print ' <div class = "introToDiplomacy_show">
<p>
Diplomacy is a game which is easy to learn but impossible to master. The rules are all very intuitive,
lots of people pick them up just by playing, but this document will familiarize you more quickly.
Expand Down Expand Up @@ -213,10 +213,11 @@
With these rules you know everything you need to start playing Diplomacy online! After you
<a href="register.php" class="light">register</a> a user account you can
<a href="gamecreate.php" class="light">create a game</a>
and <a href="gamelistings.php" class="light">join existing games</a>.
and <a href="gamelistings.php?page-games=1&gamelistType=New" class="light">join existing games</a>.
<p style="text-align:center;">
<img src="<?php print STATICSRV; ?>datc/maps/812-large.map-thumb" alt=" "
title="Because Prussia is support-holding the fleet in the Baltic Sea the equally supported move to the Baltic Sea from Livonia fails: This allows the fleet in the Baltic Sea to successfully convoy an army from Berlin to Sweden" />
</p>
</li>
</ul>
</ul>
</div>

0 comments on commit 674f553

Please sign in to comment.