Skip to content

Commit

Permalink
afsfas
Browse files Browse the repository at this point in the history
  • Loading branch information
@markm-freelancer
markm-freelancer committed Jul 7, 2013
1 parent 930ed9e commit b2020a7
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 5 deletions.
7 changes: 7 additions & 0 deletions mtg-web/src/main/java/com/mtg/web/controller/SupportController.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.mtg.web.controller;

import java.security.Principal;

import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
Expand Down Expand Up @@ -27,4 +29,9 @@ public interface SupportController {
@RequestMapping("/updates")
ModelAndView updates();

@RequestMapping("/etiquette")
ModelAndView etiquette(Principal principal);

@RequestMapping("/formatting")
ModelAndView formatting(Principal principal);
}
17 changes: 17 additions & 0 deletions mtg-web/src/main/java/com/mtg/web/controller/impl/SupportControllerImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.mtg.web.controller.impl;

import java.security.Principal;

import javax.annotation.Resource;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;

Expand All @@ -12,6 +16,8 @@
@Component
public class SupportControllerImpl extends GenericController implements SupportController {

private static Logger log = LoggerFactory.getLogger(SupportControllerImpl.class);

@Resource
private FrontpageService frontpage;

Expand Down Expand Up @@ -41,4 +47,15 @@ public ModelAndView updates() {
return mav("support/updates");
}

@Override
public ModelAndView etiquette(Principal principal) {
log.info("Ettiquette page requested. user = {}", name(principal));
return mav("support/etiquette");
}

@Override
public ModelAndView formatting(Principal principal) {
log.info("Formatting help page requested. user = {}", name(principal));
return mav("support/formatting");
}
}
1 change: 1 addition & 0 deletions mtg-web/src/main/java/com/mtg/web/dto/DtoMaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ private static ChainableMap map() {
}

public static Map<String,Object> transform(Wanted wanted) {
if(null == wanted) return null;
Validate.notNull(wanted);
return map()
.put("count", wanted.getCount())
Expand Down
2 changes: 1 addition & 1 deletion mtg-web/src/main/resources/icon-names.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Afghanistan-Flag,Aland-Islands,Albania-Flag,Algeria-Flag,American-Samoa,Andorra-Flag,Angola-Flag,Anguilla-Flag,Antarctica,Antigua-and-Barbuda,Argentina-Flag,Armenia-Flag,Aruba,Australia-Flag,Austria-Flag,Azerbaijan-Flag,Bahamas-Flag,Bahrain-Flag,Bangladesh-Flag,Barbados-Flag,Belarus-Flag,Belgium-Flag,Belize-Flag,Benin-Flag,Bermuda,Bhutan-Flag,BIOT,Bolivia-Flag,Bosnian-Flag,Botswana-Flag,Bouvet-Island,Brazil-Flag,British-Antarctic-Territory,British-Virgin-Islands,Brunei-Flag,Bulgaria-Flag,Burkina-Faso-Flag,Burma-Flag,Burundi-Flag,Cambodia-Flag,Cameroon-Flag,Canada-Flag,Cape-Verde-Flag,Cayman-Islands,CentralAfricanRepublic,Chad-Flag,Chile-Flag,China-Flag,Christmas-Island,Cocos-Islands,Colombia-Flag,Comoros-Flag,Congo-Flag,Congo-Kinshasa,Cook-Islands,Costa-Rica-Flag,Croatian-Flag,Cuba-Flag,Cyprus-Flag,Czech-Republic-Flag,Denmark-Flag,Djibouti-Flag,Dominican-Republic-Flag,Dominicana,East-Timor,Ecuador-Flag,Egypt-Flag,El-Salvador-Flag,England-Flag,Equatorial-Guinea-Flag,Eritrea-Flag,Estonia,Ethiopia-Flag,European-Union-Flag,Ex-Yugoslavia-Flag,Falkland-Islands,Faroe-Islands,Fiji-Flag,Finland-Flag,France-Flag,French-Polynesia,French-Southern-Territories,Gabon-Flag,Gambia-Flag,Georgia-Flag,Germany-Flag,Ghana-Flag,Gibraltar-Flag,Greece-Flag,Greenland-Flag,Grenada-Flag,Guadeloupe,Guam-Flag,Guatemala-Flag,Guernsey,Guinea-Bissau-Flag,Guinea-Flag,Guyana-Flag,Haiti-Flag,Holy-see-Flag,Honduras-Flag,Hong-Kong-Flag,Hungary-Flag,Iceland-Flag,India-Flag,Indonesia-Flag,Iran-Flag,Iraq-Flag,Ireland-Flag,Isle-of-Man-Flag,Israel-Flag,Italy-Flag,Ivory-Coast-Flag,Jamaica-Flag,Jan-Mayen-Flag,Japan-Flag,Jarvis-Island-Flag,Jersey-Flag,Jordan-Flag,Kazakhstan-Flag,Kenya-Flag,Kiribati,Korea-Flag,Kuwait-Flag,Kyrgyzstan-Flag,Laos-Flag,Latvia-Flag,Lebanon-Flag,Lesotho-Flag,Liberia-Flag,Libya-Flag,Liechtenstein-Flag,Lithuania-Flag,Luxembourg-Flag,Macau-Flag,Macedonia-Flag,Madagascar-Flag,Malawi-Flag,Malaysia-Flag,Maldives-Flag,Mali-Flag,Malta-Flag,Marshall-Islands-Flag,Martinique,Mauritania-Flag,Mauritius-Flag,Mayotte-Flag,Mexico-Flag,Micronesia-Flag,Moldova-Flag,Monaco-Flag,Mongolia-Flag,Montenegro-Flag,Montserrat-Flag,Morocco-Flag,Mozambique-Flag,Myanmar,Namibia-Flag,Nauru-Flag,Nepal-Flag,Netherlands-Antilles,Netherlands-Flag,New-Caledonia-Flag,New-Zealand-Flag,Nicaragua-Flag,Niger-Flag,Nigeria-Flag,Niue-Flag,Norfolk-Island,North-Korea-Flag,Northern-Ireland,Northern-Mariana-Islands,Norway-Flag,Oman-Flag,Pakistan-Flag,Palau-Flag,Palestinian-Territory,Panama-Flag,Papua-New-Guinea-Flag,Paraguay-Flag,Peru-Flag,Philippines-Flag,Pitcairn,Poland-Flag,Portugal-Flag,Puerto-Rico-Flag,Qatar-Flag,Reunion,Romania-Flag,Russia-Flag,Rwanda-Flag,Saint Pierre and Miquelon,Saint Vincent and the Grenadines,Saint-Barthelemy-Flag,Saint-Barthelemy,Saint-Helena-Dependencies,Saint-Helena-Flag,Saint-Kitts-and-Nevis,Saint-Lucia-Flag,Saint-Martin-Flag,Saint-Martin,Samoa-Flag,San-Marino-Flag,Sao-Tome-and-Principe,Saudi-Arabia-Flag,Scotland,Senegal-Flag,Serbia-Flag,Seychelles-Flag,Sierra-Leone-Flag,Singapore-Flag,Slovakia-Flag,Slovenia-Flag,SMOM,Solomon-Islands-Flag,Somalia-Flag,South-Africa-Flag,South-Georgia-Flag,Spain-Flag,SPM,Sri-Lanka-Flag,Sudan-Flag,Suriname-Flag,Svalbard-Flag,SVG,Swaziland-Flag,Sweden-Flag,Switzerland-Flag,Syria-Flag,Taiwan-Flag,Tajikistan-Flag,Tanzania-Flag,Thailand-Flag,Thumbs.db,Timor-Leste-Flag,Togo-Flag,Tokelau-Flag,Tonga-Flag,Trinidad-and-Tobago,Tunisia-Flag,Turkey-Flag,Turkmenistan-Flag,Turks-and-Caicos-Islands,Tuvalu-Flag,Uganda-Flag,Ukraine-Flag,United-Arab-Emirates,United-Kingdom-flag,United-States-Flag,Uruguay-Flag,Uzbekistan-Flag,Vanuatu-Flag,Vatican-City,Venezuela-Flag,Vietnam-Flag,Virgin-Islands-Flag,Wales,Wallis-and-Futuna-Flag,Western-Sahara,Yemen-Flag,Zambia-Flag,Zimbabwe-Flag
Afghanistan-Flag,Aland-Islands,Albania-Flag,Algeria-Flag,American-Samoa,Andorra-Flag,Angola-Flag,Anguilla-Flag,Antarctica,Antigua-and-Barbuda,Argentina-Flag,Armenia-Flag,Aruba,Australia-Flag,Austria-Flag,Azerbaijan-Flag,Bahamas-Flag,Bahrain-Flag,Bangladesh-Flag,Barbados-Flag,Belarus-Flag,Belgium-Flag,Belize-Flag,Benin-Flag,Bermuda,Bhutan-Flag,BIOT,Bolivia-Flag,Bosnian-Flag,Botswana-Flag,Bouvet-Island,Brazil-Flag,British-Antarctic-Territory,British-Virgin-Islands,Brunei-Flag,Bulgaria-Flag,Burkina-Faso-Flag,Burma-Flag,Burundi-Flag,Cambodia-Flag,Cameroon-Flag,Canada-Flag,Cape-Verde-Flag,Cayman-Islands,CentralAfricanRepublic,Chad-Flag,Chile-Flag,China-Flag,Christmas-Island,Cocos-Islands,Colombia-Flag,Comoros-Flag,Congo-Flag,Congo-Kinshasa,Cook-Islands,Costa-Rica-Flag,Croatian-Flag,Cuba-Flag,Cyprus-Flag,Czech-Republic-Flag,Denmark-Flag,Djibouti-Flag,Dominican-Republic-Flag,Dominicana,East-Timor,Ecuador-Flag,Egypt-Flag,El-Salvador-Flag,England-Flag,Equatorial-Guinea-Flag,Eritrea-Flag,Estonia,Ethiopia-Flag,European-Union-Flag,Ex-Yugoslavia-Flag,Falkland-Islands,Faroe-Islands,Fiji-Flag,Finland-Flag,France-Flag,French-Polynesia,French-Southern-Territories,Gabon-Flag,Gambia-Flag,Georgia-Flag,Germany-Flag,Ghana-Flag,Gibraltar-Flag,Greece-Flag,Greenland-Flag,Grenada-Flag,Guadeloupe,Guam-Flag,Guatemala-Flag,Guernsey,Guinea-Bissau-Flag,Guinea-Flag,Guyana-Flag,Haiti-Flag,Holy-see-Flag,Honduras-Flag,Hong-Kong-Flag,Hungary-Flag,Iceland-Flag,India-Flag,Indonesia-Flag,Iran-Flag,Iraq-Flag,Ireland-Flag,Isle-of-Man-Flag,Israel-Flag,Italy-Flag,Ivory-Coast-Flag,Jamaica-Flag,Jan-Mayen-Flag,Japan-Flag,Jarvis-Island-Flag,Jersey-Flag,Jordan-Flag,Kazakhstan-Flag,Kenya-Flag,Kiribati,Korea-Flag,Kuwait-Flag,Kyrgyzstan-Flag,Laos-Flag,Latvia-Flag,Lebanon-Flag,Lesotho-Flag,Liberia-Flag,Libya-Flag,Liechtenstein-Flag,Lithuania-Flag,Luxembourg-Flag,Macau-Flag,Macedonia-Flag,Madagascar-Flag,Malawi-Flag,Malaysia-Flag,Maldives-Flag,Mali-Flag,Malta-Flag,Marshall-Islands-Flag,Martinique,Mauritania-Flag,Mauritius-Flag,Mayotte-Flag,Mexico-Flag,Micronesia-Flag,Moldova-Flag,Monaco-Flag,Mongolia-Flag,Montenegro-Flag,Montserrat-Flag,Morocco-Flag,Mozambique-Flag,Myanmar,Namibia-Flag,Nauru-Flag,Nepal-Flag,Netherlands-Antilles,Netherlands-Flag,New-Caledonia-Flag,New-Zealand-Flag,Nicaragua-Flag,Niger-Flag,Nigeria-Flag,Niue-Flag,Norfolk-Island,North-Korea-Flag,Northern-Ireland,Northern-Mariana-Islands,Norway-Flag,Oman-Flag,Pakistan-Flag,Palau-Flag,Palestinian-Territory,Panama-Flag,Papua-New-Guinea-Flag,Paraguay-Flag,Peru-Flag,Philippines-Flag,Pitcairn,Poland-Flag,Portugal-Flag,Puerto-Rico-Flag,Qatar-Flag,Reunion,Romania-Flag,Russia-Flag,Rwanda-Flag,Saint Pierre and Miquelon,Saint Vincent and the Grenadines,Saint-Barthelemy-Flag,Saint-Barthelemy,Saint-Helena-Dependencies,Saint-Helena-Flag,Saint-Kitts-and-Nevis,Saint-Lucia-Flag,Saint-Martin-Flag,Saint-Martin,Samoa-Flag,San-Marino-Flag,Sao-Tome-and-Principe,Saudi-Arabia-Flag,Scotland,Senegal-Flag,Serbia-Flag,Seychelles-Flag,Sierra-Leone-Flag,Singapore-Flag,Slovakia-Flag,Slovenia-Flag,SMOM,Solomon-Islands-Flag,Somalia-Flag,South-Africa-Flag,South-Georgia-Flag,Spain-Flag,SPM,Sri-Lanka-Flag,Sudan-Flag,Suriname-Flag,Svalbard-Flag,SVG,Swaziland-Flag,Sweden-Flag,Switzerland-Flag,Syria-Flag,Taiwan-Flag,Tajikistan-Flag,Tanzania-Flag,Thailand-Flag,Timor-Leste-Flag,Togo-Flag,Tokelau-Flag,Tonga-Flag,Trinidad-and-Tobago,Tunisia-Flag,Turkey-Flag,Turkmenistan-Flag,Turks-and-Caicos-Islands,Tuvalu-Flag,Uganda-Flag,Ukraine-Flag,United-Arab-Emirates,United-Kingdom-Flag,United-States-Flag,Uruguay-Flag,Uzbekistan-Flag,Vanuatu-Flag,Vatican-City,Venezuela-Flag,Vietnam-Flag,Virgin-Islands-Flag,Wales,Wallis-and-Futuna-Flag,Western-Sahara,Yemen-Flag,Zambia-Flag,Zimbabwe-Flag
4 changes: 3 additions & 1 deletion mtg-web/src/main/webapp/WEB-INF/view/city/city-posts.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<#import "../templates/tools.ftl" as tools />
<span id="active-navbar-class" class="hide">communities</span>

<#if city.banned>
<#if !city??>
<div class="alert alert-info">City not found</div>
<#elseif city.banned>
<div class="alert alert-error">This city has been banned</div>
<#else>

Expand Down
4 changes: 3 additions & 1 deletion mtg-web/src/main/webapp/WEB-INF/view/meetup/meetup-posts.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<#import "../templates/tools.ftl" as tools />
<span id="active-navbar-class" class="hide">communities</span>

<#if meetup.banned>
<#if !meetup??>
<div class="alert alert-info">Meetup not found</div>
<#elseif meetup.banned>
<div class="alert alert-info">This meetup has been banned</div>
<#else>

Expand Down
4 changes: 2 additions & 2 deletions mtg-web/src/main/webapp/WEB-INF/view/post/post.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<textarea name="text" placeholder="Reply to this post"></textarea>
<div>
<small class="pull-right muted">
<a href="javascript:;">reddiquette</a>
<a href="javascript:;">formatting help</a>
<a href="<@spring.url '/support/etiquette' />" target="_blank">etiquette</a>
<a href="<@spring.url '/support/formatting' />" target="_blank">formatting help</a>
</small>
<input type="submit" value="save" class="btn btn-primary btn-small" />
</div>
Expand Down
1 change: 1 addition & 0 deletions mtg-web/src/main/webapp/WEB-INF/view/support/etiquette.jsp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Be nice.
48 changes: 48 additions & 0 deletions mtg-web/src/main/webapp/WEB-INF/view/support/formatting.jsp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<#import "/spring.ftl" as spring />

<table class="table">
<thead>
<tr>
<th>You type</th>
<th>You see</th>
<th>Working?</th>
</tr>
</thead>
<tbody>
<tr>
<td>/c/wrath-of-god</td>
<td><a href="<@spring.url '/c/wrath-of-god' />">Wrath of God</a></td>
<td>Not yet</td>
</tr>
<tr>
<td>/m/titan</td>
<td><a href="<@spring.url '/m/titan' />">/m/titan</a></td>
<td>Not yet</td>
</tr>
<tr>
<td>/ct/new-york</td>
<td><a href="<@spring.url '/ct/new-york' />">/ct/new-york</a></td>
<td>Not yet</td>
</tr>
<tr>
<td>/cy/latvia</td>
<td><a href="<@spring.url '/cy/latvia' />">/cy/latvia</a></td>
<td>Not yet</td>
</tr>
<tr>
<td>/u/markm</td>
<td><a href="<@spring.url '/u/markm' />">/u/markm</a></td>
<td>Not yet</td>
</tr>
<tr>
<td>/cc/2ww</td>
<td><img src="<@spring.url '/images/mana/2.png' />" alt="2"/><img src="<@spring.url '/images/mana/w.png' />" alt="W"/><img src="<@spring.url '/images/mana/w.png' />" alt="W"/></td>
<td>Not yet</td>
</tr>
<tr>
<td>/cc/1{b/r}{b/r}</td>
<td><img src="<@spring.url '/images/mana/1.png' />" alt="2"/><img src="<@spring.url '/images/mana/br.png' />" alt="{b/r}"/><img src="<@spring.url '/images/mana/br.png' />" alt="{b/r}"/></td>
<td>Not yet</td>
</tr>
</tbody>
</table>

0 comments on commit b2020a7

Please sign in to comment.