stepic to stepik rename
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 29 Jul 2016 13:14:40 +0000 (16:14 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 29 Jul 2016 13:14:40 +0000 (16:14 +0300)
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushTask.java
python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.form
python/educational-core/student/src/com/jetbrains/edu/learning/ui/LoginPanel.form
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java

index 2a24bb066e3d11b91b7b1ba5a76d6efca909e8cb..9a7d38aa6bdb3978a4f92ffa0336763cabac5eae 100644 (file)
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class CCPushCourse extends DumbAwareAction {
   public CCPushCourse() {
-    super("Upload Course to Stepic", "Upload Course to Stepic", null);
+    super("Upload Course to Stepik", "Upload Course to Stepik", null);
   }
 
   @Override
index 4acfffe5c7035daac1afb45c11e3357ab2083ed7..d3bceb0ba5493d066829eb8343632f202dbc72f0 100644 (file)
@@ -17,13 +17,14 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.stepic.CourseInfo;
 import com.jetbrains.edu.learning.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.EduStepicNames;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
 public class CCPushLesson extends DumbAwareAction {
   public CCPushLesson() {
-    super("Update Lesson on Stepic", "Update Lesson on Stepic", null);
+    super("Update Lesson on Stepik", "Update Lesson on Stepik", null);
   }
 
   @Override
@@ -47,7 +48,7 @@ public class CCPushLesson extends DumbAwareAction {
     if (lesson != null && course.getId() > 0) {
       e.getPresentation().setEnabledAndVisible(true);
       if (lesson.getId() <= 0) {
-        e.getPresentation().setText("Upload Lesson to Stepic");
+        e.getPresentation().setText("Upload Lesson to Stepik");
       }
     }
   }
@@ -74,7 +75,7 @@ public class CCPushLesson extends DumbAwareAction {
     ProgressManager.getInstance().run(new Task.Modal(project, "Uploading Lesson", true) {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
-        indicator.setText("Uploading lesson to http://stepic.org");
+        indicator.setText("Uploading lesson to " + EduStepicNames.STEPIC_URL);
         if (lesson.getId() > 0) {
           EduStepicConnector.updateLesson(project, lesson, indicator);
         }
index c7d3888795c3ee291a11bfb19cb76ea40986c71c..260ea0ad2cec585998fc8abf271336b9a5a5acdf 100644 (file)
@@ -17,11 +17,12 @@ import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.EduStepicNames;
 import org.jetbrains.annotations.NotNull;
 
 public class CCPushTask extends DumbAwareAction {
   public CCPushTask() {
-    super("Update Task on Stepic", "Update Task on Stepic", null);
+    super("Update Task on Stepik", "Update Task on Stepik", null);
   }
 
   @Override
@@ -48,7 +49,7 @@ public class CCPushTask extends DumbAwareAction {
       e.getPresentation().setEnabledAndVisible(true);
       final com.jetbrains.edu.learning.courseFormat.Task task = lesson.getTask(taskDir.getName());
       if (task.getStepicId() <= 0) {
-        e.getPresentation().setText("Upload Task to Stepic");
+        e.getPresentation().setText("Upload Task to Stepik");
       }
     }
   }
@@ -79,7 +80,7 @@ public class CCPushTask extends DumbAwareAction {
     ProgressManager.getInstance().run(new Task.Modal(project, "Uploading Task", true) {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
-        indicator.setText("Uploading task to http://stepic.org");
+        indicator.setText("Uploading task to " + EduStepicNames.STEPIC_URL);
         if (task.getStepicId() <= 0) {
           EduStepicConnector.postTask(project, task, lesson.getId());
         }
index 7710f5e392c51f2a15e7bda7f90a39e891f391ba..7bba04a1131ec9d01bfcee57ed1ca6cd247d737d 100644 (file)
@@ -1,7 +1,7 @@
 package com.jetbrains.edu.learning.stepic;
 
 public class EduStepicNames {
-  public static final String STEPIC_URL = "https://stepic.org";
+  public static final String STEPIC_URL = "https://stepik.org";
   public static final String STEPIC_API_URL = STEPIC_URL + "/api";
   public static final String RECOMMENDATIONS_URL = "/recommendations";
   public static final String CONTENT_TYPE_APPL_JSON = "application/json";
@@ -22,5 +22,5 @@ public class EduStepicNames {
   public static final String STEPS = "/steps";
   public static final String SECTIONS = "/sections/";
   public static final String ENROLLMENTS = "/enrollments";
-  public static final String STEPIC_SIGN_IN_LINK = "https://stepic.org/accounts/signup/?next=/users/16516293/learn";
+  public static final String STEPIC_SIGN_IN_LINK = "https://stepik.org/accounts/signup/?next=/users/16516293/learn";
 }
index 7de92495dd2fde7833349111959f9eef8f957f9f..e483adc8df310d2c53b7e0e33a2a129df7772b46 100644 (file)
@@ -13,7 +13,7 @@ public class LoginDialog extends DialogWrapper {
   public LoginDialog() {
     super(false);
     myLoginPanel = new LoginPanel(this);
-    setTitle("Login to Stepic");
+    setTitle("Login to Stepik");
     setOKButtonText("Login");
     init();
   }
index 05a78d765af9abf8ebf40f0bcf97d56317ae5745..43630061b76d8cde97f4583c786041b00e09e52e 100644 (file)
@@ -10,7 +10,7 @@
       <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
       <html.disable class="java.lang.Boolean" value="false"/>
     </clientProperties>
-    <border type="etched" title="Stepic">
+    <border type="etched" title="Stepik">
       <font/>
     </border>
     <children>
index 167b853b4cf2f3654203ff0eabc30db35ca049b6..a2402b09c9ae878b137cd03a76af56cd0558d5e1 100644 (file)
@@ -45,8 +45,8 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="&lt;html&gt;&lt;a href=&quot;https://stepic.org/accounts/signup/?next=/users/16516293/learn&quot;&gt;Do not have Stepic account?&lt;/a&gt;&lt;/html&gt;"/>
-          <toolTipText value="Click To Sign Up To Stepic"/>
+          <text value="&lt;html&gt;&lt;a href=&quot;https://stepik.org/accounts/signup/?next=/users/16516293/learn&quot;&gt;Do not have Stepik account?&lt;/a&gt;&lt;/html&gt;"/>
+          <toolTipText value="Click To Sign Up To Stepik"/>
         </properties>
       </component>
       <vspacer id="287e">
index e9d48d5242f5a39ee199fd70ecf343fc9249f735..62e3d1ee22a36359082bd0bf23629690bbe37340 100644 (file)
@@ -61,8 +61,8 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
   private static final String INVALID_COURSE = "Selected course is invalid";
   private FacetValidatorsManager myValidationManager;
   private boolean isComboboxInitialized;
-  private static final String LOGIN_TO_STEPIC_MESSAGE = "<html><u>Login to Stepic</u> to open the adaptive course </html>";
-  private static final String LOGIN_TO_STEPIC = "Login to Stepic";
+  private static final String LOGIN_TO_STEPIC_MESSAGE = "<html><u>Login to Stepik</u> to open the adaptive course </html>";
+  private static final String LOGIN_TO_STEPIC = "Login to Stepik";
 
   public StudyNewProjectPanel(@NotNull final StudyProjectGenerator generator) {
     super(new VerticalFlowLayout(true, true));
@@ -185,7 +185,7 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
                                        });
               }
               else if (LOGIN_TO_STEPIC.equals(selectedValue)) {
-                showLoginDialog(true, "Signing In And Getting Stepic Course List");
+                showLoginDialog(true, "Signing In And Getting Stepik Course List");
               }
             });
           }