Programming exercises: Move the open repository buttons to the new code popup

docs/user/exams/students_guide.rst

@@ -118,9 +118,9 @@ Exam Conduction
     - When there are unsaved **or** unsubmitted changes, the exercise representation in the navigation sidebar becomes |exam_unsaved|.
     - When your changes are saved **and** submitted, the exercise representation in the navigation sidebar becomes |exam_saved|.
     - |exam_started| indicates that you have not started this exercise.
-    - |saved_exercises| indicates the number of saved **and** submitted exercises out of the total number of exercises. Here, there are 5 exercises in total, and 2 out of the 5 have been saved and submitted. 
+    - |saved_exercises| indicates the number of saved **and** submitted exercises out of the total number of exercises. Here, there are 5 exercises in total, and 2 out of the 5 have been saved and submitted.
 
-- Once you click on another exercise in the navigation sidebar, your changes will be saved and submitted automatically. 
+- Once you click on another exercise in the navigation sidebar, your changes will be saved and submitted automatically.
 - You can also collapse the navigation sidebar to maximize the size of the exercises by clicking on |collapse_sidebar|. When the sidebar is collapsed, you can still see the exercise type and current status of the exercise.
 
     .. warning::
@@ -251,7 +251,7 @@ Participating in Programming Exercises
 
    Participating in Programming Exercises with the online code editor and local IDE enabled
 
-- If your exercise allows the use of the local IDE you will have access to the button |clone_repo|.
+- If your exercise allows the use of the local IDE, you can clone your repository using the |code| button.
 - When you click it you can choose to clone the exercise via ``HTTPS`` or ``SSH``, if you have configured your private key.
 
     .. note::
@@ -452,7 +452,7 @@ Grades
 .. |left_arrow| image:: student/buttons/left_arrow.png
 .. |outline_box| image:: student/buttons/outline_box.png
 .. |build_passed| image:: student/buttons/hidden.png
-.. |clone_repo| image:: student/buttons/clone_repo.png
+.. |code| image:: student/buttons/code.png
 .. |help| image:: student/buttons/help.png
 .. |continue| image:: student/buttons/continue.png
 .. |complain| image:: student/buttons/complain.png

docs/user/exercises/programming-integrated-code-lifecycle-repository-view.inc

@@ -7,19 +7,20 @@ For Students
 """"""""""""
 
 As a student, you can use the repository to view your course submissions.
-To access your submissions, you need to navigate to the exercise and press the '*Open Repository*' button.
+To access your submissions, you need to navigate to the exercise, press the '*Code*' button, and click on |open-repository-button|.
 
-.. figure:: programming/open-repository-button.png
-   :alt: Open Repository Button
+.. figure:: programming/open-repository-student.png
+   :alt: Opening the repository in the student view
    :align: center
 
-   Open Repository Button
+   Opening the repository (student view)
 
 After pressing the button, you will be redirected to the **Current Repository Content** page of the repository.
 This view shows the current content of the repository with the latest changes in a read-only code editor. You can view the code, but you cannot edit it.
 You can also navigate through the whole code by clicking on the file names in the file browser on the left side.
-To the right side of the screen, above the problem statement, you can see the result of the submission. Lastly, you can copy the repository URI by pressing
-the '*Clone Repository*' button to clone the repository to your local machine and see the full commit history by pressing the '*Open Commit History*' button.
+To the right side of the screen, above the problem statement, you can see the result of the submission. You can also copy the repository URI by pressing
+the '*Code*' button to clone the repository to your local machine and see the full commit history by pressing the '*Open Commit History*' button. Finally, you can
+download the repository as a ZIP file by pressing the '*Download Repository*' button.
 
 .. figure:: programming/current-repository-content-view.png
    :alt: Current Repository Content
@@ -53,20 +54,23 @@ For Instructors
 """""""""""""""
 
 As an instructor, you can use the repository to view the submissions of your students. For this purpose, you need to navigate to the exercise participations page.
-Here you can see all the students’ participations for the exercise and navigate to the repository of a student by pressing the '*Open Repository*' button.
+Here you can see all the students’ participations for the exercise and navigate to the repository of a student by pressing the '*Code*' button and clicking on |open-repository-button|.
 This will show the repository of the student just like it is shown to the student.
 
-.. figure:: programming/participations-open-repository.png
+.. figure:: programming/open-repository-instructor-participations.png
    :alt: Open Repository Button in Participations Page
    :align: center
 
    Open Repository Button in Participations Page
 
-Furthermore, you can also see the repositories for an exercises **solution**, **template** and **test** repositories.
-You can navigate to these repositories by pressing the '*Open Repository*' button in the exercise management page.
+You can also see the repositories for an exercises **solution**, **template** and **test** repositories on the exercise management page.
+You can navigate to these repositories by pressing the '*Code*' button and clicking |open-repository-button| as described above.
 
 .. figure:: programming/course-management-repositories.png
    :alt: Solution, Template and Test Repositories in Exercise Management Page
    :align: center
 
    Solution, Template and Test Repositories in Exercise Management Page
+
+.. |open-repository-button| image:: programming/open-repository-button.png
+   :scale: 50%

src/main/webapp/app/detail-overview-list/detail-overview-list.component.html

@@ -55,20 +55,12 @@ <h3 class="section-headline" [id]="headlinesRecord[section.headline]">{{ section
                         <dd id="detail-value-{{ detail.title }}">
                             @if (detail.data.participation?.repositoryUri && detail.data.exerciseId) {
                                 <div class="clone-buttons">
-                                    <jhi-clone-repo-button [smallButtons]="true" [repositoryUri]="detail.data.participation?.repositoryUri!" />
+                                    <jhi-code-button
+                                        [smallButtons]="true"
+                                        [routerLinkForRepositoryView]="['.', 'repository', detail.data.type]"
+                                        [repositoryUri]="detail.data.participation?.repositoryUri!"
+                                    />
                                     <jhi-programming-exercise-instructor-repo-download class="ms-2" [exerciseId]="detail.data.exerciseId" [repositoryType]="detail.data.type" />
-                                    @if (detail.data.showOpenLink) {
-                                        <a [href]="detail.data.participation?.repositoryUri!" target="_blank" class="btn btn-sm btn-info ms-2">
-                                            <fa-icon [icon]="faArrowUpRightFromSquare" />
-                                            <span jhiTranslate="artemisApp.programmingExercise.openRepository"></span>
-                                        </a>
-                                    }
-                                    @if (isLocalVC) {
-                                        <a [routerLink]="['./', 'repository', detail.data.type]" class="btn btn-sm btn-primary ms-2">
-                                            <fa-icon [icon]="faCodeBranch" />
-                                            <span jhiTranslate="artemisApp.exerciseActions.openRepository"></span>
-                                        </a>
-                                    }
                                 </div>
                             } @else {
                                 <ng-container *ngTemplateOutlet="noData" />
@@ -82,19 +74,13 @@ <h3 class="section-headline" [id]="headlinesRecord[section.headline]">{{ section
                                     @if (auxiliaryRepository.id && auxiliaryRepository.repositoryUri && detail.data.exerciseId) {
                                         <li class="mt-2">
                                             <span>Repository: {{ auxiliaryRepository.name }}</span>
-                                            <jhi-clone-repo-button class="ms-2" [smallButtons]="true" [repositoryUri]="auxiliaryRepository.repositoryUri" />
+                                            <jhi-code-button class="ms-2" [smallButtons]="true" [repositoryUri]="auxiliaryRepository.repositoryUri" />
                                             <jhi-programming-exercise-instructor-repo-download
                                                 class="ms-2"
                                                 [exerciseId]="detail.data.exerciseId"
                                                 [repositoryType]="'AUXILIARY'"
                                                 [auxiliaryRepositoryId]="auxiliaryRepository.id"
                                             />
-                                            @if (detail.data.showOpenLink) {
-                                                <a [href]="auxiliaryRepository.repositoryUri" target="_blank" class="btn btn-sm btn-info ms-2">
-                                                    <fa-icon [icon]="faArrowUpRightFromSquare" />
-                                                    <span jhiTranslate="artemisApp.programmingExercise.openRepository"></span>
-                                                </a>
-                                            }
                                             <div class="auxiliaryRepositoryDescription">
                                                 @if (!auxiliaryRepository.checkoutDirectory) {
                                                     <fa-icon [icon]="faExclamationTriangle" class="text-warning me-1" [ngbTooltip]="noCheckoutDirectorySetTooltip" />

src/main/webapp/app/detail-overview-list/detail.model.ts

@@ -88,14 +88,13 @@ interface ProgrammingRepositoryButtonsDetail extends DetailBase {
     data: {
         exerciseId?: number;
         participation?: TemplateProgrammingExerciseParticipation | SolutionProgrammingExerciseParticipation;
-        showOpenLink?: boolean;
         type: ProgrammingExerciseInstructorRepositoryType;
     };
 }
 
 interface ProgrammingAuxiliaryRepositoryButtonsDetail extends DetailBase {
     type: DetailType.ProgrammingAuxiliaryRepositoryButtons;
-    data: { auxiliaryRepositories: AuxiliaryRepository[]; exerciseId?: number; showOpenLink?: boolean };
+    data: { auxiliaryRepositories: AuxiliaryRepository[]; exerciseId?: number };
 }
 
 interface ProgrammingTestStatusDetail extends DetailBase {

src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html

@@ -4,19 +4,11 @@
             <div class="col-md-4">
                 <div class="mb-4">
                     <h5>{{ 'artemisApp.exam.examSummary.yourSubmission' | artemisTranslate }}</h5>
-                    <jhi-clone-repo-button [smallButtons]="true" [repositoryUri]="participation?.userIndependentRepositoryUri || ''" />
-                    @if (localVCEnabled) {
-                        <a
-                            class="btn btn-primary"
-                            [class.btn-sm]="true"
-                            [routerLink]="routerLink + '/exercises/' + exercise.id + '/repository/' + participation.id"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                        >
-                            <fa-icon [icon]="faCodeBranch" [fixedWidth]="true" />
-                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.openRepository"></span>
-                        </a>
-                    }
+                    <jhi-code-button
+                        [smallButtons]="true"
+                        [repositoryUri]="participation?.userIndependentRepositoryUri || ''"
+                        [routerLinkForRepositoryView]="routerLink + '/exercises/' + exercise.id + '/repository/' + participation.id"
+                    />
                     <br />
                     <span>
                         {{ 'artemisApp.exam.examSummary.submissionLinkedToCommit' | artemisTranslate }}

src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts

@@ -362,7 +362,6 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
                         participation: exercise.templateParticipation,
                         exerciseId: exercise.id,
                         type: 'TEMPLATE',
-                        showOpenLink: !this.localVCEnabled,
                     },
                 },
                 {
@@ -372,7 +371,6 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
                         participation: exercise.solutionParticipation,
                         exerciseId: exercise.id,
                         type: 'SOLUTION',
-                        showOpenLink: !this.localVCEnabled,
                     },
                 },
                 {
@@ -382,7 +380,6 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
                         participation: { repositoryUri: exercise.testRepositoryUri },
                         exerciseId: exercise.id,
                         type: 'TESTS',
-                        showOpenLink: !this.localVCEnabled,
                     },
                 },
                 this.supportsAuxiliaryRepositories &&
@@ -392,7 +389,6 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
                         data: {
                             auxiliaryRepositories: exercise.auxiliaryRepositories,
                             exerciseId: exercise.id,
-                            showOpenLink: !this.localVCEnabled,
                         },
                     },
                 exercise.isAtLeastEditor &&

src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html

@@ -219,7 +219,11 @@ <h4>{{ 'artemisApp.exerciseAssessmentDashboard.exampleSolution' | artemisTransla
                                 <jhi-button jhiTranslate="artemisApp.exerciseAssessmentDashboard.programmingExercise.exampleSolution" />
                             </a>
                         } @else {
-                            <jhi-clone-repo-button [smallButtons]="true" [repositoryUri]="programmingExercise.solutionParticipation?.repositoryUri || ''" />
+                            <jhi-code-button
+                                [smallButtons]="true"
+                                [routerLinkForRepositoryView]="['/course-management', courseId, 'programming-exercises', exerciseId, 'repository', 'SOLUTION']"
+                                [repositoryUri]="programmingExercise.solutionParticipation?.repositoryUri || ''"
+                            />
                         }
                     </div>
                 }

src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html

@@ -317,7 +317,12 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                                                         Repository
                                                     </a>
                                                 } @else {
-                                                    <jhi-clone-repo-button class="me-1" [smallButtons]="true" [repositoryUri]="getRepositoryLink(value) || ''" />
+                                                    <jhi-code-button
+                                                        class="me-1"
+                                                        [routerLinkForRepositoryView]="['/courses', course.id, 'exercises', exercise.id, 'repository', value.id]"
+                                                        [smallButtons]="true"
+                                                        [repositoryUri]="getRepositoryLink(value) || ''"
+                                                    />
                                                 }
                                             }
                                             @if (buildPlanId(value) && !localVCEnabled) {

src/main/webapp/app/exercises/shared/participation/participation.component.html

@@ -115,11 +115,10 @@ <h2>
                     </ng-template>
                 </ngx-datatable-column>
                 @if (exercise?.type === ExerciseType.PROGRAMMING) {
-                    <ngx-datatable-column prop="repositoryUri" [minWidth]="120" [width]="120">
+                    <ngx-datatable-column prop="repositoryUri" [minWidth]="80" [width]="80">
                         <ng-template ngx-datatable-header-template>
-                            <span class="datatable-header-cell-wrapper" (click)="controls.onSort('repositoryUri')">
-                                <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.participation.repositoryUri"></span>
-                                <fa-icon [icon]="controls.iconForSortPropField('repositoryUri')" />
+                            <span class="datatable-header-cell-wrapper">
+                                <span class="datatable-header-cell-label bold" jhiTranslate="artemisApp.participation.repository"></span>
                             </span>
                         </ng-template>
                         <ng-template ngx-datatable-cell-template let-value="value" let-row="row">
@@ -128,28 +127,18 @@ <h2>
                                     @if (!localVCEnabled) {
                                         <a href="{{ getRepositoryLink(row, value) }}" target="_blank" rel="noreferrer noopener">Repository Link</a>
                                     } @else {
-                                        <jhi-clone-repo-button class="ms-2" [smallButtons]="true" [repositoryUri]="getRepositoryLink(row, value)" />
+                                        <jhi-code-button
+                                            class="ms-2"
+                                            [smallButtons]="true"
+                                            [routerLinkForRepositoryView]="'./' + row.id + '/repository'"
+                                            [repositoryUri]="getRepositoryLink(row, value)"
+                                        />
                                     }
                                 </span>
                             }
                         </ng-template>
                     </ngx-datatable-column>
                 }
-                @if (exercise?.type === ExerciseType.PROGRAMMING && localVCEnabled) {
-                    <ngx-datatable-column [minWidth]="120" [width]="150">
-                        <ng-template ngx-datatable-header-template>
-                            <span class="datatable-header-cell-wrapper">
-                                <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.repository.title"></span>
-                            </span>
-                        </ng-template>
-                        <ng-template ngx-datatable-cell-template let-row="row">
-                            <a [routerLink]="['./', row.id, 'repository']" class="btn btn-sm btn-primary ms-2">
-                                <fa-icon [icon]="faCodeBranch" />
-                                <span jhiTranslate="artemisApp.exerciseActions.openRepository"></span>
-                            </a>
-                        </ng-template>
-                    </ngx-datatable-column>
-                }
                 @if (exercise?.type === ExerciseType.PROGRAMMING) {
                     <ngx-datatable-column [minWidth]="100" [width]="100">
                         <ng-template ngx-datatable-header-template>

src/main/webapp/app/exercises/shared/participation/participation.component.ts

@@ -55,7 +55,6 @@ export class ParticipationComponent implements OnInit, OnDestroy {
     gradeStepsDTO?: GradeStepsDTO;
     gradeStepsDTOSub: Subscription;
 
-    // Used to show the "Clone Repository URI" button instead of a link to GitLab when the "localvc" profile is active.
     localVCEnabled = false;
 
     private dialogErrorSource = new Subject<string>();

src/main/webapp/app/guided-tour/tours/course-exercise-overview-tour.ts

@@ -86,7 +86,7 @@ export const courseExerciseOverviewTour: GuidedTour = {
             triggerNextStep: true,
         }),
         new TextTourStep({
-            highlightSelector: '.course-exercise-row.guided-tour .clone-repository',
+            highlightSelector: '.course-exercise-row.guided-tour .code-button',
             headlineTranslateKey: 'tour.courseExerciseOverview.repositoryCreated.headline',
             contentTranslateKey: 'tour.courseExerciseOverview.repositoryCreated.content',
             highlightPadding: 5,