Skip to content

Commit

Permalink
remove our twitter account and in the form (#1439)
Browse files Browse the repository at this point in the history 
* no twitter for new profiles
* editing twitter only possible when the profile has already an twitter account
* fix view of the website in the show view
* remove any twitter occurance


Co-authored-by: Maren Heltsche <2119496+zaziemo@users.noreply.github.com>
  • Loading branch information
@tyranja @zaziemo
tyranja and zaziemo authored Feb 24, 2025
1 parent 60713ce commit 3a4a635
Show file tree
Hide file tree
Showing 24 changed files with 126 additions and 124 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

#Ignore IDE files
.idea/
notes/

.ruby-version
.ruby-gemset
Expand Down
8 changes: 3 additions & 5 deletions app/assets/stylesheets/custom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ a.anchor {
padding: 0;
}

a.button_link {
.single-profile .button_link {
text-decoration: none;
&:hover {
background-color: transparent;
Expand Down Expand Up @@ -187,13 +187,11 @@ h1 {
color: $header-grey;
}

.single-profile, #footer {
.single-profile {
a {
text-decoration: none;
text-decoration: underline;
cursor: pointer;
padding: 0.2em;
font-weight: bold;
// color: $link-color;
&:hover {
background-color: $dropdown-hover-background;
text-decoration: none;
Expand Down
3 changes: 1 addition & 2 deletions app/models/profile.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ class Profile < ApplicationRecord
translations: [
[:bio, 'C'],
[:city, 'B'],
[:main_topic, 'A'],
[:twitter, 'D']
[:main_topic, 'A']
],
topics: [[:name, 'A']]
},
Expand Down
2 changes: 1 addition & 1 deletion app/serializers/profile_serializer.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

class ProfileSerializer < ActiveModel::Serializer
attributes :id, :firstname, :lastname, :city, :country, :twitter, :created_at,
attributes :id, :firstname, :lastname, :city, :country, :created_at,
:updated_at, :website, :website_2, :website_3, :profession, :topics, :bio, :main_topic

has_many :medialinks
Expand Down
3 changes: 0 additions & 3 deletions app/views/layouts/_footer.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
</div>
<div class="col-12 col-md-2">
<ul class="list-unstyled">
<li class="d-flex">
<%= t(:twitter, scope: 'pages.footer').html_safe %>
</li>
<li class="d-flex">
<%= t(:instagram, scope: 'pages.footer').html_safe %>
</li>
Expand Down
8 changes: 3 additions & 5 deletions app/views/pages/about.de.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<b>Maren Heltsche </b>
<p>Maren Heltsche ist Mitgründerin, Projektmanagerin und eine der Entwicklerinnen der Plattform <a href="http://speakerinnen.org" target="_blank">speakerinnen.org</a>. Sie arbeitet als Programmiererin, liebt DIY, Digital Media und Kunst.<br>Sie engagiert sich für Gleichberechtigung in der Digitalen Transformation bei den <a href="https://www.digitalmediawomen.de" target="_blank">Digital Media Women</a> und im <a href="https://www.frauenrat.de/" target="_blank">Deutschen Frauenrat</a>.
</p>
<a href="https://twitter.com/zaziemo" target="_blank">Maren auf Twitter: @zaziemo</a>
</div>
</div>
<div class="row my-5">
Expand All @@ -30,7 +29,7 @@
<div class="col-sm-10">
<b>Anja</b>
<p>Anja ist gelernte Kommunikationsdesignerin und war jahrelang als Fotoredakteurin bei einer Zeitung angestellt. 2012 hat sie mit den <a href="http://railsgirlsberlin.de" target="_blank"> RailsGirls </a> angefangen zu programmieren. Seitdem arbeitet sie mit an <a href="http://speakerinnen.org" target="_blank">speakerinnen.org</a>, der <a href="http://50prozent.speakerinnen.org/" target="_blank">50Prozent Seite</a> und an den <a href="http://www.frauenstudien-muenchen.de/" target="_blank">Frauenstudien München</a>. 2015 hat sie ihr Hobby zum Beruf gemacht und arbeitet jetzt als Programmierin.</p>
<a href="https://twitter.com/_tyranja_" target="_blank">Anja auf Twitter: @_tyranja_</a><br>
<a href="https://bsky.app/profile/tyranja.bsky.social" target="_blank">Anja auf Bluesky</a><br>
<a href="https://github.com/tyranja" target="_blank">Anja auf Github</a>
</div>
</div>
Expand Down Expand Up @@ -77,7 +76,6 @@
<div class="col-sm-10">
<b>Sabrina Ulbrich</b>
<p>Sabrina Ulbrich eine der Entwicklerinnen von speakerinnen.org. Sie studiert Philosophie und programmiert in Ruby.</p>
<a href="https://twitter.com/sabrna" target="_blank">Sabrina auf Twitter: @sabrna</a><br>
<a href="https://github.com/sabrina-ulbrich" target="_blank">Sabrina auf Github</a>
</div>
</div>
Expand Down Expand Up @@ -122,7 +120,7 @@ When she is not at work she is most likely at her desk drawing something spooky.
</div>
<h4 class="mt-5">Hintergrund:</h4>
<p>
Die Speakerinnen-Liste ist die Idee vieler Frauen und wurde von <a href="https://twitter.com/annalist" target="_blank">Anne Roth</a> initiiert. Die Plattform wurde von 8 Frauen mit der Unterstützung von 4 Coaches als Lernprojekt der Rubymonstas,
Die Speakerinnen-Liste ist die Idee vieler Frauen und wurde von <a href="https://bsky.app/profile/anneroth.bsky.social" target="_blank">Anne Roth</a> initiiert. Die Plattform wurde von 8 Frauen mit der Unterstützung von 4 Coaches als Lernprojekt der Rubymonstas,
einer Lerngruppe der Rails Girls Berlin, gebaut.
</p>
<p>
Expand All @@ -134,7 +132,7 @@ When she is not at work she is most likely at her desk drawing something spooky.

<h4 class="mt-5">Railsgirls / Rubymonstas:</h4>
<p>
Die <a href="http://www.railsgirlsberlin.de" target="_blank">Rails Girls</a> sind eine internationale Non-Profit-Gruppe, die Frauen motiviert, sich mit dem Programmieren zu beschäftigen. Das Ganze über wunderbare Workshops, Lerngruppen, Stipendien und eine angenehme Lern-Community. Die <a href="https://twitter.com/RubyMonstas" target="_blank">Rubymonstas</a> sind eine Lerngruppe, die aus einem Workshop der Rails Girls hervorgegangen ist.
Die <a href="http://www.railsgirlsberlin.de" target="_blank">Rails Girls</a> sind eine internationale Non-Profit-Gruppe, die Frauen motiviert, sich mit dem Programmieren zu beschäftigen. Das Ganze über wunderbare Workshops, Lerngruppen, Stipendien und eine angenehme Lern-Community. Die Rubymonstas waren eine Lerngruppe, die aus einem Workshop der Rails Girls hervorgegangen ist.
</p>

<h4 class="mt-5">Unterstützen:</h4>
Expand Down
8 changes: 3 additions & 5 deletions app/views/pages/about.en.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<b>Maren Heltsche</b>
<p>Maren Heltsche is a cofounder, the project manager and one of the developers of <a href="http://speakerinnen.org" target="_blank">speakerinnen.org</a>. She works as a software developer, loves DIY, digital media and art. As a volunteer in the nationwide <a href="https://www.digitalmediawomen.de" target="_blank">Digital Media Women</a> network and as Special Representative on Digitalisation for the Board of the <a href="https://www.frauenrat.de/shortinfo/">National Council of German Women‘s Organizations</a> she campaigns for greater gender equality in technology, politics, business and society.
</p>
<a href="https://twitter.com/zaziemo" target="_blank">Maren on Twitter: @zaziemo</a>
</div>
</div>
<div class="row my-5">
Expand All @@ -34,7 +33,7 @@
<div class="col-sm-10">
<b>Anja</b>
<p>Anja is trained communication designerin and for years she was employed as photo editor at a newspaper.2012 she started with the <a href="http://railsgirlsberlin.de" target="_blank"> RailsGirls </a> to program. Since then she works on <a href="http://speakerinnen.org" target="_blank">speakerinnen.org</a>, <a href="http://50prozent.speakerinnen.org/" target="_blank">50Prozent Seite</a> and <a href="http://www.frauenstudien-muenchen.de/" target="_blank">Frauenstudien München</a>. 2015 she made her hobby into a profession and works now as a programer.</p>
<a href="https://twitter.com/_tyranja_" target="_blank">Anja on Twitter: @_tyranja_</a><br>
<a href="https://bsky.app/profile/tyranja.bsky.social" target="_blank">Anja on Bluesky</a><br>
<a href="https://github.com/tyranja" target="_blank">Anja on Github</a>
</div>
</div>
Expand Down Expand Up @@ -81,7 +80,6 @@
<div class="col-sm-10">
<b>Sabrina Ulbrich</b>
<p>Sabrina Ulbrich is one of the developers of speakerinnen.org. She studies philosophy and programs in Ruby.</p>
<a href="https://twitter.com/sabrna" target="_blank">Sabrina on Twitter: @sabrna</a><br>
<a href="https://github.com/sabrina-ulbrich" target="_blank">Sabrina on Github</a>
</div>
</div>
Expand Down Expand Up @@ -129,15 +127,15 @@ When she is not at work she is most likely at her desk drawing something spooky.
Speakerinnen.org was created by 8 women with the support of 4 coaches as part of "Rails Girls Berlin" learning project.
</p>
<p>
The project was initiated by <a href="https://twitter.com/annalist" target="_blank">Anne Roth</a>. The idea of having a database of women speakers originated during numerous discussions both online and offline about the dominance of men in the public domain. There are lots of reasons for this and speakerinnen.org isn't a solution for all of them. But it is a step towards making it easier for organisers to achieve a balanced male to female ratio at their events.
The project was initiated by <a href="https://bsky.app/profile/anneroth.bsky.social" target="_blank">Anne Roth</a>. The idea of having a database of women speakers originated during numerous discussions both online and offline about the dominance of men in the public domain. There are lots of reasons for this and speakerinnen.org isn't a solution for all of them. But it is a step towards making it easier for organisers to achieve a balanced male to female ratio at their events.
</p>
<p>
In addition we want to support women in finding the right platform. We hope they will be encouraged by the experiences of other women and see that they too have a contribution to make.
</p>

<h4 class="mt-5">Railsgirls / Rubymonstas:</h4>
<p>
<a href="http://www.railsgirlsberlin.de" target="_blank">Rails Girls</a> is an international non-profit organisation that motivates women to learn computer programming. They facilitate this through interesting workshops, study groups, grants and by creating a positive learning community. The <a href="https://twitter.com/RubyMonstas" target="_blank">Rubymonsters</a> are a study group which emerged during one of the Rails Girls Berlin workshops.
<a href="http://www.railsgirlsberlin.de" target="_blank">Rails Girls</a> is an international non-profit organisation that motivates women to learn computer programming. They facilitate this through interesting workshops, study groups, grants and by creating a positive learning community. The Rubymonsters were a study group which emerged during one of the Rails Girls Berlin workshops.
</p>

<h4 class="mt-5">How can you support us:</h4>
Expand Down
2 changes: 1 addition & 1 deletion app/views/pages/faq.de.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<p>Jetzt kannst Du Tags eingeben, also die Themen, mit denen Du Dich beschäftigst. Das kann Journalismus sein, Biotechnologie oder Netzfeminismus. Bitte prüfe zuerst, ob es bereits Tags gibt, die Du nutzen kannst.
Du findest sie, indem Du einfach die ersten Buchstaben Deines Wunsch-Tags eingibst – dann werden Dir Begriffe vorgeschlagen. Oder Du schaust Dir auf der Speakerinnen-Seite an, welche Themen bereits eingegeben wurden.</p>

<p>Im nächsten Schritt findest Du zwei Reiter: Deutsch und Englisch. Hier kannst Du weitere Profilinformationen jeweils in beiden Sprachen hinterlegen. Du kannst aber auch nur den deutschen bzw. nur den englischen Reiter ausfüllen. Hier gibst Du an: die Stadt, in der Du wohnst und soweit vorhanden einen Twitter-Account sowie eine oder mehrere Webseiten.
<p>Im nächsten Schritt findest Du zwei Reiter: Deutsch und Englisch. Hier kannst Du weitere Profilinformationen jeweils in beiden Sprachen hinterlegen. Du kannst aber auch nur den deutschen bzw. nur den englischen Reiter ausfüllen. Hier gibst Du an: die Stadt, in der Du wohnst und soweit vorhanden einen Social-Media-Account sowie eine oder mehrere Webseiten.
Als nächsten hinterlegst Du hier einen Themenschwerpunkt. Das sollte Dein Hauptthema sein – nur eins, bitte eindeutig und gut verständlich. Beispiele hierfür sind „Social Media“, „Nachhaltige Landwirtschaft“ oder auch „Human Resources“.
Das Hauptthema erscheint als Bildunterschrift unter Deinem Profilfoto. Wichtig: in der Übersicht der Profile wird das Hauptthema auf 31 Zeichen begrenzt.</p>

Expand Down
2 changes: 1 addition & 1 deletion app/views/pages/faq.en.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
You can find them by simply entering the first few letters of your desired tag - then terms will be suggested. Or you can look at the speakers page to see which topics have already been entered.
</p>

<p>In the next step you will find two tabs: German and English. Here you can enter further profile information in both languages. You can also fill out only the German or only the English tab. Here you enter: the city you live in and, if available, a Twitter account and one or more websites.
<p>In the next step you will find two tabs: German and English. Here you can enter further profile information in both languages. You can also fill out only the German or only the English tab. Here you enter: the city you live in and, if available, a social media account and one or more websites.
Next, you should enter your main topic - just one, please be clear and easy to understand. Examples are "Social Media", "Sustainable Agriculture" or "Human Resources".
The main topic appears as a caption under your profile photo. Important: in the profile overview the main topic is limited to 31 characters.
</p>
Expand Down
33 changes: 19 additions & 14 deletions app/views/profiles/_profile_formfields.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,18 +181,21 @@
id: "city_de", class: '', title: t(:city_tooltip, scope: 'profiles.form').html_safe %>
<%= f.text_field :city_de, as: :text, class: 'form-control mb-3', maxlength: '30' %>
</div>
<div class="form-group">
<%= f.label :twitter, t(:twitter, scope: 'profiles.form').html_safe, id: "twitter_de" %>
<%= f.text_field :twitter_de, as: :text, placeholder: '@', class: "form-control mb-3", maxlength: 30 %>
</div>
<%# Only show twitter field if user already has a twitter account %>
<% if @profile.twitter.present? %>
<div class="form-group">
<%= f.label :twitter, t(:twitter, scope: 'profiles.form').html_safe, id: "twitter_de" %>
<%= f.text_field :twitter_de, as: :text, placeholder: '@', class: "form-control mb-3", maxlength: 30 %>
</div>
<% end %>
<div class="form-group">
<%= f.label :website, t(:website, scope: 'profiles.form'), id: "website_de" %>
<%= f.text_field :website_de, as: :text, placeholder: 'http://', class: "form-control mb-3"%>
<%= f.text_field :website_de, as: :text, placeholder: 'https://', class: "form-control mb-3"%>
</div>
<div class="form-group">
<%= f.label :additional_websites, t(:additional_websites, scope: 'profiles.form'), id: "website_2_de" %>
<%= f.text_field :website_2_de, as: :text, placeholder: 'http://', class: "form-control mb-3"%>
<%= f.text_field :website_3_de, as: :text, placeholder: 'http://', class: "form-control mb-3"%>
<%= f.text_field :website_2_de, as: :text, placeholder: 'https://', class: "form-control mb-3"%>
<%= f.text_field :website_3_de, as: :text, placeholder: 'https://', class: "form-control mb-3"%>
</div>
<div class="form-group">
<%= f.label :main_topic, t(:main_topic, scope: 'profiles.form',
Expand Down Expand Up @@ -223,18 +226,20 @@
id: "city_en", class: 'pt-3', title: t(:city_tooltip, scope: 'profiles.form').html_safe %>
<%= f.text_field :city_en, as: :text, class: 'form-control mb-3', maxlength: '30' %>
</div>
<div class="form-group">
<%= f.label :twitter, t(:twitter, scope: 'profiles.form'), id: "twitter_en" %>
<%= f.text_field :twitter_en, as: :text, placeholder: '@', class: "form-control mb-3", maxlength: 30 %>
</div>
<% if @profile.twitter.present? %>
<div class="form-group">
<%= f.label :twitter, t(:twitter, scope: 'profiles.form'), id: "twitter_en" %>
<%= f.text_field :twitter_en, as: :text, placeholder: '@', class: "form-control mb-3", maxlength: 30 %>
</div>
<% end %>
<div class="form-group">
<%= f.label :website, t(:website, scope: 'profiles.form'), id: "website_en" %>
<%= f.text_field :website_en, as: :text, placeholder: 'http://', class: "form-control mb-3" %>
<%= f.text_field :website_en, as: :text, placeholder: 'https://', class: "form-control mb-3" %>
</div>
<div class="form-group">
<%= f.label :additional_websites, t(:additional_websites, scope: 'profiles.form'), id: "website_2_en" %>
<%= f.text_field :website_2_en, as: :text, placeholder: 'http://', class: "form-control mb-3" %>
<%= f.text_field :website_3_en, as: :text, placeholder: 'http://', class: "form-control mb-3" %>
<%= f.text_field :website_2_en, as: :text, placeholder: 'https://', class: "form-control mb-3" %>
<%= f.text_field :website_3_en, as: :text, placeholder: 'https://', class: "form-control mb-3" %>
</div>
<div class="form-group">
<%= f.label :main_topic, t(:main_topic, scope: 'profiles.form',
Expand Down
Loading

0 comments on commit 3a4a635

Please sign in to comment.