Commit d38c96e5 authored by Matija Obreza's avatar Matija Obreza

Blurbs

- Article slugs updated
- Request and model parameters renamed
- Translations renamed
parent badc9df4
......@@ -113,31 +113,31 @@ public class OrganizationController extends ApiBaseController {
}
/**
* Get organization blurp
* Get organization blurb
*
* @return
* @throws AuthorizationException
*/
@RequestMapping(value = "/{shortName}/blurp/{language}", method = RequestMethod.GET, produces = { MediaType.APPLICATION_JSON_VALUE })
@RequestMapping(value = "/{shortName}/blurb/{language}", method = RequestMethod.GET, produces = { MediaType.APPLICATION_JSON_VALUE })
public @ResponseBody
String getBlurp(@PathVariable("shortName") String shortName, @PathVariable("language") String language) throws AuthorizationException {
String getBlurb(@PathVariable("shortName") String shortName, @PathVariable("language") String language) throws AuthorizationException {
PGRFANetwork org = networkService.getNetwork(shortName);
Article article = networkService.getBlurb(org, new Locale(language));
return article == null ? null : article.getBody();
}
/**
* Update blurp
* Update blurb
*
* @return
* @throws AuthorizationException
* @throws CRMException
*/
@RequestMapping(value = "/{shortName}/blurp", method = RequestMethod.PUT, produces = { MediaType.APPLICATION_JSON_VALUE })
@RequestMapping(value = "/{shortName}/blurb", method = RequestMethod.PUT, produces = { MediaType.APPLICATION_JSON_VALUE })
public @ResponseBody
Article updateBlurp(@PathVariable("shortName") String shortName, @RequestBody OrganizationBlurpJson blurp) throws AuthorizationException, CRMException {
Article updateBlurb(@PathVariable("shortName") String shortName, @RequestBody OrganizationBlurbJson blurb) throws AuthorizationException, CRMException {
PGRFANetwork org = networkService.getNetwork(shortName);
return networkService.updateAbout(org, blurp.blurp, blurp.summary, blurp.getLocale());
return networkService.updateAbout(org, blurb.blurb, blurb.summary, blurb.getLocale());
}
/**
......@@ -208,9 +208,9 @@ public class OrganizationController extends ApiBaseController {
return networkService.setInstitutes(network, instituteList);
}
public static class OrganizationBlurpJson {
public static class OrganizationBlurbJson {
public String summary;
public String blurp;
public String blurb;
public String locale;
public Locale getLocale() {
......
......@@ -91,7 +91,7 @@ public class CountryController extends BaseController {
model.addAttribute("region", geoRegionService.getRegion(country));
model.addAttribute("itpgrfa", geoService.getITPGRFAStatus(country));
model.addAttribute("blurp", contentService.getArticle(country, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(country, ContentService.ENTITY_BLURB_SLUG, getLocale()));
// All institutes
model.addAttribute("faoInstitutes", instituteService.listByCountry(country));
......@@ -143,14 +143,14 @@ public class CountryController extends BaseController {
@PreAuthorize("hasRole('ADMINISTRATOR')")
@RequestMapping("/{country}/update")
public String update(ModelMap model, @PathVariable(value = "country") String countryStr, @RequestParam("blurp") String blurp) throws CRMException {
public String update(ModelMap model, @PathVariable(value = "country") String countryStr, @RequestParam("blurb") String blurb) throws CRMException {
LOG.debug("Editing country {}", countryStr);
final Country country = geoService.getCountry(countryStr);
if (country == null) {
throw new NotFoundElement();
}
geoService.updateBlurp(country, blurp, getLocale());
geoService.updateBlurb(country, blurb, getLocale());
return "redirect:/geo/" + country.getCode3();
}
......
......@@ -136,7 +136,7 @@ public class CropController extends BaseController {
model.addAttribute("jsonFilter", appliedFilters.toString());
model.addAttribute("cropRules", cropService.getCropRules(crop));
model.addAttribute("cropTaxonomies", cropService.getCropTaxonomies(crop, new PageRequest(0, 21, new Sort("taxonomy.genus", "taxonomy.species"))));
model.addAttribute("blurp", contentService.getArticle(crop, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(crop, ContentService.ENTITY_BLURB_SLUG, getLocale()));
// model.addAttribute("statsGenus",
// elasticService.termStatisticsAuto(appliedFilters,
......@@ -185,7 +185,7 @@ public class CropController extends BaseController {
@RequestMapping(value = "/{shortName}/update", method = RequestMethod.POST)
public String update(ModelMap model, @PathVariable(value = "shortName") String shortName, @RequestParam(value = "cropName", required = false) String cropName,
@RequestParam("blurp") String aboutBody, @RequestParam(value = "summary", required = false) String summary) throws CRMException {
@RequestParam("blurb") String aboutBody, @RequestParam(value = "summary", required = false) String summary) throws CRMException {
Crop crop = cropService.getCrop(shortName);
if (crop == null) {
......@@ -194,7 +194,7 @@ public class CropController extends BaseController {
}
LOG.debug("Updating crop blurb {}", shortName);
cropService.updateBlurp(crop, aboutBody, summary, getLocale());
cropService.updateBlurb(crop, aboutBody, summary, getLocale());
return "redirect:/c/" + shortName;
}
......
......@@ -46,7 +46,7 @@ public class GeoRegionController extends BaseController {
Country.sort(countryList, getLocale());
model.addAttribute("region", geoRegion);
model.addAttribute("blurp", contentService.getArticle(geoRegion, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(geoRegion, ContentService.ENTITY_BLURB_SLUG, getLocale()));
List<GeoRegion> subRegions = geoRegionService.getChildren(geoRegion.getIsoCode());
GeoRegion.sort(subRegions, getLocale());
model.addAttribute("subRegions", subRegions);
......@@ -68,7 +68,7 @@ public class GeoRegionController extends BaseController {
}
@RequestMapping("/{isoCode}/update")
public String update(ModelMap model, @PathVariable(value = "isoCode") String code, @RequestParam("blurp") String body,
public String update(ModelMap model, @PathVariable(value = "isoCode") String code, @RequestParam("blurb") String body,
@RequestParam(value = "summary", required = false) String summary) throws CRMException {
LOG.debug("Updating region {}", code);
......
......@@ -97,10 +97,10 @@ public class HtmlController extends BaseController {
printSplit("cropList", stopWatch);
model.addAttribute("lastNews", contentService.lastNews());
printSplit("lastNews", stopWatch);
model.addAttribute("welcomeBlurp", contentService.getGlobalArticle(ContentService.WELCOME, getLocale()));
printSplit("welcomeBlurp", stopWatch);
model.addAttribute("sideBlurp", contentService.getGlobalArticle(ContentService.SIDE_BLURP, getLocale()));
printSplit("sideBlurp", stopWatch);
model.addAttribute("welcomeBlurb", contentService.getGlobalArticle(ContentService.WELCOME, getLocale()));
printSplit("welcomeBlurb", stopWatch);
model.addAttribute("sideBlurb", contentService.getGlobalArticle(ContentService.SIDE_BLURP, getLocale()));
printSplit("sideBlurb", stopWatch);
model.addAttribute("organizationsBlurb", contentService.getGlobalArticle(ContentService.WELCOME_ORGANIZATIONS, getLocale()));
printSplit("organizationsBlurb", stopWatch);
model.addAttribute("numberOfCountries", statisticsService.numberOfCountries());
......
......@@ -50,7 +50,7 @@ public class ITPGRFAController extends BaseController {
@RequestMapping
public String view(ModelMap model, @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.ITPGRFA_ABOUT, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.ITPGRFA_ABOUT, getLocale()));
model.addAttribute("countries", geoService.listITPGRFA(getLocale()));
return "/itpgrfa/countries";
}
......
......@@ -46,7 +46,7 @@ public class LookAndFeelController extends BaseController {
public String index(ModelMap model) {
model.addAttribute("cropList", cropService.list(getLocale()));
model.addAttribute("lastNews", contentService.lastNews());
model.addAttribute("welcomeBlurp", contentService.getGlobalArticle(ContentService.ABOUT, getLocale()));
model.addAttribute("welcomeBlurb", contentService.getGlobalArticle(ContentService.ABOUT, getLocale()));
model.addAttribute("captchaSiteKey", captchaSiteKey);
return "/lookandfeel";
......
......@@ -93,7 +93,7 @@ public class OrganizationController extends BaseController {
model.addAttribute("organization", network);
model.addAttribute("members", members);
model.addAttribute("blurp", contentService.getArticle(network, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(network, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("statisticsPDCI", statisticsService.statisticsPDCI(network));
return "/organization/details";
......@@ -134,7 +134,7 @@ public class OrganizationController extends BaseController {
@PreAuthorize("hasRole('ADMINISTRATOR')")
@RequestMapping(value = "/{slug}/update")
public String update(ModelMap model, @PathVariable(value = "slug") String slug, @RequestParam(value = "slug") String newSlug,
@RequestParam("title") String title, @RequestParam("blurp") String blurp, @RequestParam(value = "summary", required = false) String summary) throws CRMException {
@RequestParam("title") String title, @RequestParam("blurb") String blurb, @RequestParam(value = "summary", required = false) String summary) throws CRMException {
LOG.debug("Updating organization {}", slug);
PGRFANetwork network = networkService.getNetwork(slug);
......@@ -145,7 +145,7 @@ public class OrganizationController extends BaseController {
network = networkService.update(network.getId(), newSlug, title);
}
networkService.updateAbout(network, blurp, summary, getLocale());
networkService.updateAbout(network, blurb, summary, getLocale());
return "redirect:/org/" + network.getSlug();
}
......
......@@ -108,7 +108,7 @@ public class ProjectController extends BaseController {
model.addAttribute("project", project);
List<AccessionList> accessionLists = accessionListService.getLists(project.getAccessionLists());
model.addAttribute("accessionLists", accessionLists);
model.addAttribute("blurp", contentService.getArticle(project, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(project, ContentService.ENTITY_BLURB_SLUG, getLocale()));
// Statistics
int countByProject = accessionListService.distinctCount(accessionLists);
......@@ -158,7 +158,7 @@ public class ProjectController extends BaseController {
}
@RequestMapping("/update-project")
public String update(ModelMap modelMap, @ModelAttribute("project") Project p, @RequestParam("blurp") String aboutBody,
public String update(ModelMap modelMap, @ModelAttribute("project") Project p, @RequestParam("blurb") String aboutBody,
@RequestParam(value = "summary", required = false) String summary, @RequestParam(value = "accessionListTitle", required = false) List<String> titles) throws CRMException {
LOG.debug("Updating project {}", p.getCode());
......@@ -185,7 +185,7 @@ public class ProjectController extends BaseController {
project.setAccessionLists(projectAccessionLists);
projectService.saveProject(project);
projectService.updateBlurp(project, aboutBody, summary, getLocale());
projectService.updateBlurb(project, aboutBody, summary, getLocale());
return "redirect:/project/" + p.getCode();
}
......
......@@ -82,7 +82,7 @@ public class RequestController extends BaseController {
*/
@RequestMapping
public String view(ModelMap model, @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REQUEST_INTRO, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REQUEST_INTRO, getLocale()));
model.addAttribute("totalCount", selectionBean.size());
model.addAttribute("availableCount", genesysService.countAvailableForDistribution(selectionBean.copy()));
......@@ -94,7 +94,7 @@ public class RequestController extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "/start")
public String start(ModelMap model) {
final User currentUser = SecurityContextUtil.getCurrentUser();
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REQUEST_PERSONAL, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REQUEST_PERSONAL, getLocale()));
model.addAttribute("captchaSiteKey", captchaSiteKey);
if (!model.containsAttribute("requestEmail") && currentUser != null) {
......@@ -153,15 +153,15 @@ public class RequestController extends BaseController {
}
// Whatever the response is, we render the same message
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REQUEST_RECEIVED, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REQUEST_RECEIVED, getLocale()));
return "/request/received";
}
@RequestMapping(value = "/{tokenUuid:.+}/validate", method = RequestMethod.GET)
public String validateClientRequest(ModelMap model, @PathVariable("tokenUuid") String tokenUuid,
@RequestParam(value = "key", required = false) String key) {
if (!model.containsAttribute("blurp")) {
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REQUEST_VALIDATE, getLocale()));
if (!model.containsAttribute("blurb")) {
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REQUEST_VALIDATE, getLocale()));
}
model.addAttribute("tokenUuid", tokenUuid);
model.addAttribute("key", key);
......@@ -177,7 +177,7 @@ public class RequestController extends BaseController {
} catch (final RequestService.NoPidException e) {
LOG.error(e.getMessage());
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REQUEST_VALIDATE_NO_PID, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REQUEST_VALIDATE_NO_PID, getLocale()));
return validateClientRequest(model, tokenUuid, key);
} catch (final RequestException e) {
......@@ -208,8 +208,8 @@ public class RequestController extends BaseController {
*/
@RequestMapping(value = "/{tokenUuid:.+}/confirm", method = RequestMethod.GET)
public String confirmReceipt(ModelMap model, @PathVariable("tokenUuid") String tokenUuid, @RequestParam(value = "key", required = false) String key) {
if (!model.containsAttribute("blurp")) {
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REQUEST_CONFIRM_RECEIPT, getLocale()));
if (!model.containsAttribute("blurb")) {
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REQUEST_CONFIRM_RECEIPT, getLocale()));
}
model.addAttribute("tokenUuid", tokenUuid);
......
......@@ -67,7 +67,7 @@ public class TeamController extends BaseController {
}
model.addAttribute("team", team);
model.addAttribute("teammembers", teamService.getMembers(team));
model.addAttribute("blurp", contentService.getArticle(team, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(team, ContentService.ENTITY_BLURB_SLUG, getLocale()));
return "/team/details";
}
......@@ -85,7 +85,7 @@ public class TeamController extends BaseController {
} catch (final UsernameNotFoundException e) {
model.addAttribute("team", team);
model.addAttribute("teammembers", teamService.getMembers(team));
model.addAttribute("blurp", contentService.getArticle(team, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("blurb", contentService.getArticle(team, ContentService.ENTITY_BLURB_SLUG, getLocale()));
model.addAttribute("error", "error");
return "/team/details";
}
......
......@@ -187,7 +187,7 @@ public class UserProfileController extends BaseController {
@RequestMapping(value = "/forgot-password")
public String forgotPassword(ModelMap model) {
model.addAttribute("captchaSiteKey", captchaSiteKey);
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.USER_RESET_PASSWORD_INSTRUCTIONS, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.USER_RESET_PASSWORD_INSTRUCTIONS, getLocale()));
return "/user/email";
}
......
......@@ -68,7 +68,7 @@ public class UserRegistrationController extends BaseController {
@RequestMapping(value = "/registration", method = RequestMethod.GET)
public String registration(ModelMap model) {
model.addAttribute("captchaSiteKey", captchaSiteKey);
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REGISTRATION, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REGISTRATION, getLocale()));
model.addAttribute("user", new User());
return "/registration";
......@@ -125,7 +125,7 @@ public class UserRegistrationController extends BaseController {
model.addAttribute("user", user);
model.addAttribute("captchaSiteKey", captchaSiteKey);
model.addAttribute("blurp", contentService.getGlobalArticle(ContentService.REGISTRATION, getLocale()));
model.addAttribute("blurb", contentService.getGlobalArticle(ContentService.REGISTRATION, getLocale()));
return "/registration";
}
......
......@@ -177,8 +177,8 @@ public class WiewsController extends BaseController {
model.addAttribute("faoInstitute", faoInstitute);
model.addAttribute("organizations", networkService.getNetworksFor(faoInstitute));
LOG.trace("organizations after {}ms", stopWatch.getTime());
model.addAttribute("blurp", contentService.getArticle(faoInstitute, ContentService.ENTITY_BLURB_SLUG, getLocale()));
LOG.trace("blurp after {}ms", stopWatch.getTime());
model.addAttribute("blurb", contentService.getArticle(faoInstitute, ContentService.ENTITY_BLURB_SLUG, getLocale()));
LOG.trace("blurb after {}ms", stopWatch.getTime());
model.addAttribute("countByInstitute", faoInstitute.getAccessionCount());
LOG.trace("countByInstitute after {}ms", stopWatch.getTime());
......@@ -300,7 +300,7 @@ public class WiewsController extends BaseController {
}
@RequestMapping("/{wiewsCode}/update")
public String update(ModelMap model, @PathVariable(value = "wiewsCode") String wiewsCode, @RequestParam("blurp") String aboutBody,
public String update(ModelMap model, @PathVariable(value = "wiewsCode") String wiewsCode, @RequestParam("blurb") String aboutBody,
@RequestParam(value = "summary", required = false) String summary, @RequestParam("gaTracker") String gaTracker, @RequestParam("mailto") String mailto,
@RequestParam("uniqueAcceNumbs") boolean uniqueAcceNumbs,
@RequestParam(value = "allowMaterialRequests", required = false, defaultValue = "false") boolean allowMaterialRequests, @RequestParam("codeSVGS") String codeSVGS)
......
......@@ -34,12 +34,12 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface ContentService {
public final String ENTITY_BLURB_SLUG = "blurp";
public final String ENTITY_BLURB_SLUG = "blurb";
public final String ABOUT = "about";
public final String WELCOME = "welcome";
public final String COOKIES = "cookies";
public final String SIDE_BLURP = "sideBlurp";
public final String SIDE_BLURP = "sideBlurb";
public final String DISCLAIMER = "disclaimer";
public final String REGISTRATION = "registration";
public final String REQUEST_INTRO = "request-intro";
......
......@@ -53,7 +53,7 @@ public interface CropService {
List<Crop> getCrops(Taxonomy2 taxonomy2);
void updateBlurp(Crop crop, String textBody, String summary, Locale locale) throws CRMException;
void updateBlurb(Crop crop, String textBody, String summary, Locale locale) throws CRMException;
void rebuildTaxonomies();
......
......@@ -69,7 +69,7 @@ public interface GeoService {
List<Country> listAll();
void updateBlurp(Country country, String blurp, Locale locale) throws CRMException;
void updateBlurb(Country country, String blurb, Locale locale) throws CRMException;
List<Country> listAll(Locale locale);
......
......@@ -39,5 +39,5 @@ public interface ProjectService {
void deleteProject(Project project);
void updateBlurp(Project project, String textBody, String summary, Locale locale) throws CRMException;
void updateBlurb(Project project, String textBody, String summary, Locale locale) throws CRMException;
}
......@@ -192,7 +192,7 @@ public class CropServiceImpl implements CropService {
@Override
@PreAuthorize("hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER') or hasPermission(#crop, 'ADMINISTRATION')")
@Transactional(readOnly = false)
public void updateBlurp(Crop crop, String textBody, String summary, Locale locale) throws CRMException {
public void updateBlurb(Crop crop, String textBody, String summary, Locale locale) throws CRMException {
//isTemplate = false because it's crop
contentService.updateArticle(crop, ContentService.ENTITY_BLURB_SLUG, null, textBody, summary, locale);
}
......
......@@ -442,9 +442,9 @@ public class GeoServiceImpl implements GeoService {
@Override
@PreAuthorize("hasRole('ADMINISTRATOR')")
@Transactional(readOnly = false)
public void updateBlurp(Country country, String blurp, Locale locale) throws CRMException {
public void updateBlurb(Country country, String blurb, Locale locale) throws CRMException {
// TODO Should we provide summary?
contentService.updateArticle(country, ContentService.ENTITY_BLURB_SLUG, null, blurp, null, locale);
contentService.updateArticle(country, ContentService.ENTITY_BLURB_SLUG, null, blurb, null, locale);
}
@Override
......
......@@ -85,7 +85,7 @@ public class ProjectServiceImpl implements ProjectService {
@Override
@PreAuthorize("hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER') or hasPermission(#project, 'ADMINISTRATION')")
@Transactional
public void updateBlurp(Project project, String textBody, String summary, Locale locale) throws CRMException {
public void updateBlurb(Project project, String textBody, String summary, Locale locale) throws CRMException {
//isTemplate = false because it's project.
contentService.updateArticle(project, ContentService.ENTITY_BLURB_SLUG, null, textBody, summary, locale);
}
......
......@@ -576,10 +576,10 @@ activitypost.add-new-post=Add new post
activitypost.post-title=Post title
activitypost.post-body=Body
blurp.admin-no-blurp-here=No blurp here.
blurp.blurp-title=Blurp title
blurp.blurp-body=Blurp contents
blurp.update-blurp=Save blurp
blurb.admin-no-blurb-here=No blurb here.
blurb.blurb-title=Blurb title
blurb.blurb-body=Blurb contents
blurb.update-blurb=Save blurb
oauth2.deny-access=Deny access
oauth2.grant-selected-scopes=Grant access to selected scopes
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=إضافة مشاركة جديدة
activitypost.post-title=عنوان المشاركة
activitypost.post-body=النص
blurp.admin-no-blurp-here=لا يوجد مختصر هنا.
blurp.blurp-title=عنوان المختصر
blurp.blurp-body=محتويات المختصر
blurp.update-blurp=حفظ المختصر
blurb.admin-no-blurb-here=لا يوجد مختصر هنا.
blurb.blurb-title=عنوان المختصر
blurb.blurb-body=محتويات المختصر
blurb.update-blurb=حفظ المختصر
oauth2.confirm-request=تأكيد الوصول
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=Neuen Beitrag hinzufügen
activitypost.post-title=Beitragsüberschrift
activitypost.post-body=Text
blurp.admin-no-blurp-here=Keine weiteren Erklärungen verfügbar.
blurp.blurp-title=Überschrift weitere Erklärungen
blurp.blurp-body=Inhalt weitere Erklärungen
blurp.update-blurp=Weitere Erklärungen speichern
blurb.admin-no-blurb-here=Keine weiteren Erklärungen verfügbar.
blurb.blurb-title=Überschrift weitere Erklärungen
blurb.blurb-body=Inhalt weitere Erklärungen
blurb.update-blurb=Weitere Erklärungen speichern
oauth2.confirm-request=Zugriff bestätigen
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=Agregar una nueva publicación
activitypost.post-title=Título de la publicación
activitypost.post-body=Cuerpo
blurp.admin-no-blurp-here=Sin descripción.
blurp.blurp-title=Título de la descripción
blurp.blurp-body=Contenidos de la descripción
blurp.update-blurp=Guardar descripción
blurb.admin-no-blurb-here=Sin descripción.
blurb.blurb-title=Título de la descripción
blurb.blurb-body=Contenidos de la descripción
blurb.update-blurb=Guardar descripción
oauth2.confirm-request=Confirmar acceso
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=افزودن مطلب جدید
activitypost.post-title=عنوان مطلب
activitypost.post-body=متن
blurp.admin-no-blurp-here=شرحی در اینجا وجود ندارد.
blurp.blurp-title=عنوان شرح
blurp.blurp-body=محتوای شرح
blurp.update-blurp=ذخیره شرح
blurb.admin-no-blurb-here=شرحی در اینجا وجود ندارد.
blurb.blurb-title=عنوان شرح
blurb.blurb-body=محتوای شرح
blurb.update-blurb=ذخیره شرح
oauth2.confirm-request=تایید دسترسی
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=Ajouter nouveau post
activitypost.post-title=Titre du poste
activitypost.post-body=Corps
blurp.admin-no-blurp-here=Pas d'autre description disponible.
blurp.blurp-title=Titre de la description
blurp.blurp-body=Contenus de la description
blurp.update-blurp=Sauvegarder la description
blurb.admin-no-blurb-here=Pas d'autre description disponible.
blurb.blurb-title=Titre de la description
blurb.blurb-body=Contenus de la description
blurb.update-blurb=Sauvegarder la description
oauth2.confirm-request=Confirmer l'accès
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=Adicionar novo post
activitypost.post-title=Título do post
activitypost.post-body=Corpo
blurp.admin-no-blurp-here=Não há blurp aqui.
blurp.blurp-title=Título do blurp
blurp.blurp-body=Conteúdo do blurp
blurp.update-blurp=Salvar blurp
blurb.admin-no-blurb-here=Não há blurb aqui.
blurb.blurb-title=Título do blurb
blurb.blurb-body=Conteúdo do blurb
blurb.update-blurb=Salvar blurb
oauth2.confirm-request=Confirmar acesso
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=Добавить новый пост
activitypost.post-title=Название поста
activitypost.post-body=Тело
blurp.admin-no-blurp-here=Blurp отсутствтует.
blurp.blurp-title=Название blurp
blurp.blurp-body=Содержание blurp
blurp.update-blurp=Сохранить blurp
blurb.admin-no-blurb-here=Blurb отсутствтует.
blurb.blurb-title=Название blurb
blurb.blurb-body=Содержание blurb
blurb.update-blurb=Сохранить blurb
oauth2.confirm-request=Подтвердить доступ
......
......@@ -548,10 +548,10 @@ activitypost.add-new-post=发新贴
activitypost.post-title=文章标题
activitypost.post-body=正文
blurp.admin-no-blurp-here=此处无 Blurp
blurp.blurp-title=Blurp 标题
blurp.blurp-body=Blurp 内容
blurp.update-blurp=保存 Blurp
blurb.admin-no-blurb-here=此处无 Blurb
blurb.blurb-title=Blurb 标题
blurb.blurb-body=Blurb 内容
blurb.update-blurb=保存 Blurb
oauth2.confirm-request=确认访问
......
......@@ -5769,3 +5769,17 @@ databaseChangeLog:
onUpdate: NO ACTION
referencedColumnNames: id
referencedTableName: subset_version
- changeSet:
id: 1552637148000-2
author: mobreza
changes:
- sql:
comment: Renamed 'blurb' to 'blurb'
sql: update article set slug = 'blurb' where slug = 'blurp';
- sql:
comment: Organization renamed to PGRFANetwork
sql: delete from classPk where classname='org.genesys2.server.model.impl.PGRFANetwork';
- sql:
comment: Organization renamed to PGRFANetwork
sql: update classPk set classname='org.genesys2.server.model.impl.PGRFANetwork', shortName='pgrfanetwork' where classname='org.genesys2.server.model.impl.Organization';
......@@ -651,7 +651,7 @@ body {
/*left: 0px;*/
}
.blurp {
.blurb {
background: $white-color;
padding: 38px 10px 15px;
p {
......@@ -1626,7 +1626,7 @@ form.form-horizontal .form-group {
text-align: right;
}
}
& > label[for="blurp-body"] + div,
& > label[for="blurb-body"] + div,
& > label[for="faoInstitute-summary"] + div,
& > label[for="article-body"] + div,
& > label[for="article-summary"] + div,
......@@ -1746,7 +1746,7 @@ h2.short {
right: 67%;
}
}
#content #right-col.col-md-4 .blurp p {
#content #right-col.col-md-4 .blurb p {
html[dir="ltr"] & {
padding-left: 5.7%;
}
......@@ -3361,7 +3361,7 @@ table.accessions {
.section-inner-content .row div:first-child {
border-right: none;
}
.free-text.blurp {
.free-text.blurb {
font-family: $default-font-family;
font-size: 14px;
p {
......@@ -3465,7 +3465,7 @@ table.accessions {
.form-group > div {
/*border-left: 2px solid #E7E5DF;*/
}
.form-group > label[for="blurp-body"] + div,
.form-group > label[for="blurb-body"] + div,
.form-group > label[for="faoInstitute-summary"] + div,
.form-group > label[for="article-body"] + div,
.form-group > label[for="article-summary"] + div,
......@@ -4092,7 +4092,7 @@ table.accessions {
}
#right-col.col-md-4 {
.blurp {
.blurb {
padding: 38px 0px 15px 3px;
br {
display: none;
......@@ -5188,7 +5188,7 @@ table.accessions {
}
#right-col.col-md-4 {
.blurp {
.blurb {
padding: 38px 0px 15px;
}
.free-text {
......@@ -5535,7 +5535,7 @@ table.accessions {
right: 0px;
}
}
#content #right-col.col-md-4 .blurp p {
#content #right-col.col-md-4 .blurb p {
html[dir="ltr"] & {
padding-left: 20px;
}
......@@ -6370,7 +6370,7 @@ table.accessions {
.alert-info {